[Jboss-cvs] JBossAS SVN: r54988 - in trunk/testsuite: . imports imports/sections src/main/org/jboss/test src/main/org/jboss/test/aop/simpleejb src/main/org/jboss/test/cache/bean src/main/org/jboss/test/classloader/scoping/singleton src/main/org/jboss/test/cmp2/cmr src/main/org/jboss/test/cmp2/cmr/interfaces src/main/org/jboss/test/cmp2/cmrstress src/main/org/jboss/test/cmp2/cmrstress/interfaces src/main/org/jboss/test/cmp2/cmrtree/ejb src/main/org/jboss/test/cmp2/ejbselect src/main/org/jboss/test/cmp2/enums/ejb src/main/org/jboss/test/cmp2/fkmapping/ejb src/main/org/jboss/test/cmp2/fkstackoverflow/ejb src/main/org/jboss/test/cmp2/idxandusersql/ejb src/main/org/jboss/test/cmp2/optimisticlock src/main/org/jboss/test/cmp2/optimisticlock/interfaces src/main/org/jboss/test/cmp2/passivation src/main/org/jboss/test/cmp2/passivation/interfaces src/main/org/jboss/test/cts/ejb src/main/org/jboss/test/cts/interfaces src/main/org/jboss/test/cts/service src/main/org/jboss/test/ejbconf/bean! s src/main/org/jboss/test/ejbconf/beans/interfaces src/main/org/jboss/test/entity/beans src/main/org/jboss/test/entity/interfaces src/main/org/jboss/test/jmx/deployer src/main/org/jboss/test/jmx/eardepends/dependent src/main/org/jboss/test/jmx/eardepends/dependent/interfaces src/main/org/jboss/test/jmx/eardepends/independent src/main/org/jboss/test/jmx/eardepends/independent/interfaces src/main/org/jboss/test/jmx/eardeployment/a src/main/org/jboss/test/jmx/eardeployment/a/interfaces src/main/org/jboss/test/jmx/eardeployment/b src/main/org/jboss/test/jmx/eardeployment/b/interfaces src/main/org/jboss/test/jmx/interfaces src/main/org/jboss/test/jmx/invoker src/main/org/jboss/test/jmx/loading src/main/org/jboss/test/jmx/mbean src/main/org/jboss/test/jmx/missingclass src/main/org/jboss/test/proxycompiler/beans src/main/org/jboss/test/proxycompiler/beans/interfaces src/resources src/resources/cmp2 src/resources/cmp2/ageout/META-INF src/resources/cmp2/cmr src/resources/cmp2/cmr/ME! TA-INF src/resources/cmp2/cmrstress src/resources/cmp2/cmrstress/META-INF src/resources/cmp2/cmrtree src/resources/cmp2/cmrtree/META-INF src/resources/cmp2/ejbselect/META-INF src/resources/cmp2/fkmapping src/resources/cmp2/fkmapping/META-INF src/resources/cmp2/fkstackoverflow src/resources/cmp2/fkstackoverflow/META-INF src/r

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Aug 1 13:48:31 EDT 2006


Author: scott.stark at jboss.org
Date: 2006-08-01 13:47:17 -0400 (Tue, 01 Aug 2006)
New Revision: 54988

Added:
   trunk/testsuite/src/main/org/jboss/test/aop/simpleejb/Simple.java
   trunk/testsuite/src/main/org/jboss/test/aop/simpleejb/SimpleHome.java
   trunk/testsuite/src/main/org/jboss/test/cache/bean/CacheObjectMeanTester.java
   trunk/testsuite/src/main/org/jboss/test/cache/bean/CacheObjectMeanTesterHome.java
   trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopMBeanTester.java
   trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopMBeanTesterHome.java
   trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopTester.java
   trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopTesterHome.java
   trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheMBeanTester.java
   trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheMBeanTesterHome.java
   trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheTester.java
   trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheTesterHome.java
   trunk/testsuite/src/main/org/jboss/test/classloader/scoping/singleton/MySingleton.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugEJBLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugEJBLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJB.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJBHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJBLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJBLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ChildLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ChildLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ChildUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/Parent.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/ALocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/ALocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/APK.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/AUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BPK.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/Facade.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/FacadeHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/FacadeUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ACMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ALocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ALocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/AUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BCMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/ChildLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/ChildLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/ChildUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/Facade.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/FacadeHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/FacadeUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildCMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKCMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentCMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentPK.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationCMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationPK.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupCMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupPK.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteCMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstitutePK.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/Manager.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerSession.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentCMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentPK.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentCMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentPK.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildCMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentCMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentPK.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/Facade.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeSession.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentCMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentUtil.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR1CMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR1Local.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR1LocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR2CMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR2Local.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR2LocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/DBIndexTestCMP.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/DBIndexTestLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/DBIndexTestLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/
   trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/CmpEntityLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/CmpEntityLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/Facade.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/FacadeHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/
   trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntity.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntityHome.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntityLocal.java
   trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntityLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsCmp2Bean.java
   trunk/testsuite/src/main/org/jboss/test/cts/interfaces/CtsCmp2Local.java
   trunk/testsuite/src/main/org/jboss/test/cts/service/CtsCmpService.java
   trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/
   trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnly.java
   trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyHelper.java
   trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyHelperHome.java
   trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyHome.java
   trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyLocal.java
   trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/entity/beans/TestEntityCMP.java
   trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntity.java
   trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityHome.java
   trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityLocal.java
   trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityUtil.java
   trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityValue.java
   trunk/testsuite/src/main/org/jboss/test/jmx/deployer/BrokenDeployerMBean.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/
   trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentAEJB.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentAEJBHome.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentBEJB.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentBEJBHome.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/independent/interfaces/
   trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/independent/interfaces/IndependentEJB.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/independent/interfaces/IndependentEJBHome.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/
   trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionA.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionAHome.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionALocal.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionALocalHome.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/
   trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionB.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionBHome.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionBLocal.java
   trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionBLocalHome.java
   trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityA.java
   trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityAHome.java
   trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityB.java
   trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityBHome.java
   trunk/testsuite/src/main/org/jboss/test/jmx/invoker/InvokerTestMBean.java
   trunk/testsuite/src/main/org/jboss/test/jmx/loading/Concrete.java
   trunk/testsuite/src/main/org/jboss/test/jmx/loading/ConcreteHome.java
   trunk/testsuite/src/main/org/jboss/test/jmx/mbean/TestMBClassLoaderMBean.java
   trunk/testsuite/src/main/org/jboss/test/jmx/missingclass/MissingClassTestMBean.java
   trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/
   trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTest.java
   trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTestHome.java
   trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTestLocal.java
   trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTestLocalHome.java
   trunk/testsuite/src/resources/cmp2/ageout/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/cmp2/ageout/META-INF/jbosscmp-jdbc.xml
   trunk/testsuite/src/resources/cmp2/cmr/
   trunk/testsuite/src/resources/cmp2/cmr/META-INF/
   trunk/testsuite/src/resources/cmp2/cmr/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/cmp2/cmr/META-INF/jboss.xml
   trunk/testsuite/src/resources/cmp2/cmr/META-INF/jbosscmp-jdbc.xml
   trunk/testsuite/src/resources/cmp2/cmrstress/
   trunk/testsuite/src/resources/cmp2/cmrstress/META-INF/
   trunk/testsuite/src/resources/cmp2/cmrstress/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/cmp2/cmrstress/META-INF/jboss.xml
   trunk/testsuite/src/resources/cmp2/cmrstress/META-INF/jbosscmp-jdbc.xml
   trunk/testsuite/src/resources/cmp2/cmrtree/
   trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/
   trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/jboss.xml
   trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/jbosscmp-jdbc.xml
   trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/jboss.xml
   trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/jbosscmp-jdbc.xml
   trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/original-jboss.xml
   trunk/testsuite/src/resources/cmp2/fkmapping/
   trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/
   trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/jboss.xml
   trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/jbosscmp-jdbc.xml
   trunk/testsuite/src/resources/cmp2/fkstackoverflow/
   trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/
   trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/jboss.xml
   trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/jbosscmp-jdbc.xml
   trunk/testsuite/src/resources/cmp2/idxandusersql/
   trunk/testsuite/src/resources/cmp2/idxandusersql/META-INF/
   trunk/testsuite/src/resources/cmp2/passivation/META-INF/
   trunk/testsuite/src/resources/cmp2/passivation/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/cmp2/passivation/META-INF/jboss.xml
   trunk/testsuite/src/resources/cmp2/passivation/META-INF/jbosscmp-jdbc.xml
   trunk/testsuite/src/resources/ejbconf/readonly/
   trunk/testsuite/src/resources/ejbconf/readonly/META-INF/
   trunk/testsuite/src/resources/ejbconf/readonly/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/ejbconf/readonly/META-INF/jboss.xml
   trunk/testsuite/src/resources/ejbconf/readonly/META-INF/jbosscmp-jdbc.xml
   trunk/testsuite/src/resources/jmx/eardepends/depend/
   trunk/testsuite/src/resources/jmx/eardepends/depend/META-INF/
   trunk/testsuite/src/resources/jmx/eardepends/dependent/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/jmx/eardepends/dependent/META-INF/jboss.xml
   trunk/testsuite/src/resources/jmx/eardepends/independent/
   trunk/testsuite/src/resources/jmx/eardepends/independent/META-INF/
   trunk/testsuite/src/resources/jmx/eardepends/independent/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/jmx/eardepends/independent/META-INF/jboss.xml
   trunk/testsuite/src/resources/jmx/eardeployment/a/
   trunk/testsuite/src/resources/jmx/eardeployment/a/META-INF/
   trunk/testsuite/src/resources/jmx/eardeployment/a/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/jmx/eardeployment/a/META-INF/jboss.xml
   trunk/testsuite/src/resources/jmx/eardeployment/b/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/jmx/eardeployment/b/META-INF/jboss.xml
   trunk/testsuite/src/resources/jmx/loading/cpmanifest/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/jmx/undeploy/META-INF/
   trunk/testsuite/src/resources/jmx/undeploy/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/jmx/undeploy/META-INF/jboss.xml
   trunk/testsuite/src/resources/jmx/undeploy/META-INF/jbosscmp-jdbc.xml
   trunk/testsuite/src/resources/jmx/xmbean/org/
   trunk/testsuite/src/resources/jmx/xmbean/org/jboss/
   trunk/testsuite/src/resources/jmx/xmbean/org/jboss/test/
   trunk/testsuite/src/resources/jmx/xmbean/org/jboss/test/jmx/
   trunk/testsuite/src/resources/jmx/xmbean/org/jboss/test/jmx/xmbean/
   trunk/testsuite/src/resources/jmx/xmbean/org/jboss/test/jmx/xmbean/User.xml
   trunk/testsuite/src/resources/proxycompiler/
   trunk/testsuite/src/resources/proxycompiler/META-INF/
   trunk/testsuite/src/resources/proxycompiler/META-INF/ejb-jar.xml
   trunk/testsuite/src/resources/proxycompiler/META-INF/jboss.xml
   trunk/testsuite/src/resources/proxycompiler/META-INF/jbosscmp-jdbc.xml
Removed:
   trunk/testsuite/imports/sections/foedeployer.xml
   trunk/testsuite/src/main/org/jboss/test/foedeployer/
Modified:
   trunk/testsuite/.classpath
   trunk/testsuite/build.xml
   trunk/testsuite/imports/code-generation.xml
   trunk/testsuite/imports/sections/classloader.xml
   trunk/testsuite/imports/sections/cts.xml
   trunk/testsuite/imports/test-jars.xml
Log:
Remove the use of xdoclet

Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/.classpath	2006-08-01 17:47:17 UTC (rev 54988)
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry excluding="org/jboss/test/aop/bean/AnnotatedSecuredPOJO.java|org/jboss/test/aop/bean/OverriddenAnnotation.java|org/jboss/test/aop/bean/AnnotatedTxLockedPOJO.java|org/jboss/test/aop/bean/AnnotatedTxPOJO.java|org/jboss/test/recover/derby/EmbeddedDerbyRecoverable.java|org/jboss/test/recover/oracle/OracleRecoverable.java" kind="src" path="src/main"/>
 	<classpathentry kind="src" path="src/jdk15"/>
-	<classpathentry kind="src" path="output/gen-src"/>
 	<classpathentry kind="lib" path="src/resources"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xml-apis.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/build.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -206,6 +206,7 @@
    <property name="build.stylesheets" value="${module.output}/stylesheets"/>
    <property name="build.reports" value="${module.output}/reports"/>
    <property name="build.testlog" value="${module.output}/log"/>
+   <property name="build.gen-src" value="${module.output}/gen-src/"/>
 
    <!-- Install/Release structure -->
    <property name="install.id" value="${module.name}-${module.version}"/>
@@ -285,15 +286,6 @@
 
    <target name="init">
       <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
-      <!-- Setup the version 1 classes so the tests compile -->
-      <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/>
-      <copy tofile="${build.gen-src}/org/jboss/test/cts/interfaces/CtsCmp2Local.java"
-         file="${source.java}/org/jboss/test/cts/interfaces/CtsCmp2Local_V1.txt"
-         overwrite="false"/>
-      <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/>
-      <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"
-         file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt"
-         overwrite="false"/>
    </target>
 
    <!-- ================================================================== -->
@@ -2486,57 +2478,6 @@
    </target>
 
    <!--
-      | Standard Foe-Deployer tests that should run successfully against a default
-      | JBoss server distribution build.
-    -->
-   <target name="tests-foe-deployer-unit">
-      <mkdir dir="${build.reports}"/>
-      <mkdir dir="${build.testlog}"/>
-      <junit dir="${module.output}"
-         printsummary="${junit.printsummary}"
-         haltonerror="${junit.haltonerror}"
-         haltonfailure="${junit.haltonfailure}"
-         fork="${junit.fork}"
-         timeout="${junit.timeout}"
-         jvm="${junit.jvm}">
-
-         <jvmarg value="${junit.jvm.options}"/>
-         <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
-
-         <jvmarg value="-Djava.security.manager"/>
-         <sysproperty key="java.security.policy"
-            value="${build.resources}/security/tst.policy"/>
-         <sysproperty key="java.security.auth.login.config"
-            value="${build.resources}/security/auth.conf"/>
-         <sysproperty key="build.testlog" value="${build.testlog}"/>
-         <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
-         <!-- Pass along any jbosstest.* system properties -->
-         <syspropertyset>
-            <propertyref prefix="jbosstest."/>
-         </syspropertyset>
-
-         <classpath>
-            <pathelement location="${build.classes}"/>
-            <pathelement location="${build.resources}/security"/>
-            <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
-         </classpath>
-
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
-
-         <batchtest todir="${build.reports}"
-            haltonerror="${junit.batchtest.haltonerror}"
-            haltonfailure="${junit.batchtest.haltonfailure}"
-            fork="${junit.batchtest.fork}">
-
-            <fileset dir="${build.classes}">
-               <include name="**/test/foedeployer/test/**TestCase.class"/>
-            </fileset>
-         </batchtest>
-      </junit>
-   </target>
-
-   <!--
       | JBossMX implementation tests that should run correctly.
     -->
    <target name="tests-jbossmx-implementation">

Modified: trunk/testsuite/imports/code-generation.xml
===================================================================
--- trunk/testsuite/imports/code-generation.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/imports/code-generation.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -3,732 +3,29 @@
 $Id$
 -->
 <project name="code-generation" default="help">
-
-  <target name="init-code-generation">
+  <target name="init-code-generation" depends="compile-resources">
     <mkdir dir="${build.gen-src}"/>
     <mkdir dir="${build.resources}"/>
     <mkdir dir="${build.reports}"/>
 
     <copy todir="${build.resources}" file="${source.resources}/log4j.xml" />
 
-    <taskdef name="ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
+  </target>
 
+  <target name="compile-bean-sources" depends="init-code-generation" unless="noxdoclet">
   </target>
+  <target name="compile-mbean-sources" unless="noxdoclet">
+  </target>
 
-   <!-- Compile EJB beans with XDoclet -->
-   <target name="compile-bean-sources" depends="init-code-generation" unless="noxdoclet">
+  <target name="compile-xmbean-dds" unless="noxdoclet">
 
-     <!--ejbconf-->
-     <mkdir dir="${build.resources}/ejb-conf/readonly/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.resources}/ejb-conf/readonly">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/ejbconf/beans/**/*Bean.java"/>
-       </fileset>
-       <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <!--session/-->
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/ejbconf/readonly/META-INF"/>
-       <jboss xmlencoding="UTF-8"
-         version="3.0"
-         destdir="${build.resources}/ejbconf/readonly/META-INF"
-         mergedir="${source.resources}/ejbconf/readonly/"
-         Datasource="java:/DefaultDS"
-         Typemapping="Hypersonic SQL"
-         />
-     </ejbdoclet>
+  </target>
 
-     <!--eardeployment, SessionA-->
-     <mkdir dir="${build.resources}/jmx/eardeployment/a/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.resources}/eardeployment/a">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/jmx/eardeployment/a/ejb/*Bean.java"/>
-       </fileset>
-       <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <!--session/-->
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/jmx/eardeployment/a/META-INF"/>
-       <jboss xmlencoding="UTF-8"
-         version="3.0"
-         destdir="${build.resources}/jmx/eardeployment/a/META-INF"
-         mergedir="${source.resources}/jmx/eardeployment/a/"/>
-     </ejbdoclet>
+  <target name="compile-proxycompiler-bean-sources" unless="noxdoclet">
+  </target>
 
-     <!--eardeployment, SessionB-->
-     <mkdir dir="${build.resources}/jmx/eardeployment/b/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.resources}/eardeployment/b">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/jmx/eardeployment/b/ejb/*Bean.java"/>
-       </fileset>
-       <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <!--session/-->
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/jmx/eardeployment/b/META-INF"/>
-       <jboss xmlencoding="UTF-8"
-         version="3.0"
-         destdir="${build.resources}/jmx/eardeployment/b/META-INF"
-         mergedir="${source.resources}/jmx/eardeployment/b/"/>
-     </ejbdoclet>
+  <target name="help">
+    <echo message="The project fragment which defines the jboss server configs"/>
+  </target>
 
-     <!-- eardepends Dependent[A/B] -->
-     <mkdir dir="${build.resources}/jmx/eardepends/depend/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.resources}/eardepends/dependent/META-INF">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/jmx/eardepends/dependent/ejb/*Bean.java"/>
-       </fileset>
-       <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-       <remoteinterface/>
-       <homeinterface/>
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/jmx/eardepends/dependent/META-INF"/>
-       <jboss xmlencoding="UTF-8"
-         version="3.2"
-         destdir="${build.resources}/jmx/eardepends/dependent/META-INF"
-         mergedir="${source.resources}/jmx/eardepends/dependent/META-INF"/>
-     </ejbdoclet>
-
-     <!-- eardepends Independent -->
-     <mkdir dir="${build.resources}/jmx/eardepends/independent/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.resources}/eardepends/independent/META-INF">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/jmx/eardepends/independent/ejb/*Bean.java"/>
-       </fileset>
-       <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-       <remoteinterface/>
-       <homeinterface/>
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/jmx/eardepends/independent/META-INF"/>
-       <jboss xmlencoding="UTF-8"
-         version="3.2"
-         destdir="${build.resources}/jmx/eardepends/independent/META-INF"
-         mergedir="${source.resources}/jmx/eardepends/independent/META-INF"/>
-     </ejbdoclet>
-
-     <!-- cmr written after post create -->
-     <mkdir dir="${build.resources}/cmp2/cmr/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.resources}/cmp2/cmr">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/cmp2/cmr/ejb/*Bean.java"/>
-       </fileset>
-       <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <!--session/-->
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/cmp2/cmr/META-INF"/>
-       <jboss xmlencoding="UTF-8"
-         version="3.0"
-         destdir="${build.resources}/cmp2/cmr/META-INF"
-         mergedir="${source.resources}/cmp2/cmr/"
-         Datasource="java:/DefaultDS"
-         Typemapping="Hypersonic SQL"/>
-     </ejbdoclet>
-
-    <!-- cmrtree -->
-    <mkdir dir="${build.resources}/cmp2/cmrtree/META-INF"/>
-    <ejbdoclet destdir="${build.gen-src}"
-      ejbspec="2.0"
-      excludedtags="@version, at author"
-      mergedir="${source.etc}/cmp2/cmrtree">
-      <fileset dir="${source.java}">
-        <include name="org/jboss/test/cmp2/cmrtree/ejb/*Bean.java"/>
-      </fileset>
-      <remoteinterface/>
-      <localinterface/>
-      <homeinterface/>
-      <localhomeinterface/>
-      <entitypk/>
-      <utilobject cacheHomes="true" includeGUID="false"/>
-      <!--session/-->
-      <deploymentdescriptor xmlencoding="UTF-8"
-        destdir="${build.resources}/cmp2/cmrtree/META-INF"/>
-      <jboss xmlencoding="UTF-8"
-        version="3.2"
-        preferredrelationmapping="foreign-key"
-        destdir="${build.resources}/cmp2/cmrtree/META-INF"/>
-    </ejbdoclet>
-
-     <!-- cmp2 passivation integrity test -->
-     <mkdir dir="${build.resources}/cmp2/passivation/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.resources}/cmp2/passivation">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/cmp2/passivation/ejb/*Bean.java"/>
-       </fileset>
-       <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <deploymentdescriptor
-         destdir="${build.resources}/cmp2/passivation/META-INF"
-         validatexml="${validatexml}"/>
-       <jboss
-         version="3.2"
-         xmlencoding="UTF-8"
-         destdir="${build.resources}/cmp2/passivation/META-INF"
-         validatexml="${validatexml}"
-         mergedir="${source.resources}/cmp2/passivation"/>
-     </ejbdoclet>
-
-     <!-- optimistic lock test -->
-     <mkdir dir="${build.resources}/cmp2/optimisticlock/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.resources}/cmp2/optimisticlock">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/cmp2/optimisticlock/ejb/*Bean.java"/>
-       </fileset>
-       <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-     </ejbdoclet>
-
-     <!-- foreign key mapping tests -->
-     <mkdir dir="${build.resources}/cmp2/fkmapping/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.etc}/cmp2/fkmapping">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/cmp2/fkmapping/ejb/*Bean.java"/>
-       </fileset>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <entitypk/>
-       <utilobject cacheHomes="true" includeGUID="false"/>
-       <entitycmp/>
-       <session/>
-       <deploymentdescriptor
-         destdir="${build.resources}/cmp2/fkmapping/META-INF"
-         validatexml="${validatexml}"/>
-       <jboss
-         version="3.2"
-         xmlencoding="UTF-8"
-         destdir="${build.resources}/cmp2/fkmapping/META-INF"
-         validatexml="${validatexml}"/>
-     </ejbdoclet>
-
-     <!-- foreign key mapping stack overflow error tests -->
-     <mkdir dir="${build.resources}/cmp2/fkstackoverflow/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.etc}/cmp2/fkstackoverflow">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/cmp2/fkstackoverflow/ejb/*Bean.java"/>
-       </fileset>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <entitypk/>
-       <utilobject cacheHomes="true" includeGUID="false"/>
-       <entitycmp/>
-       <session/>
-       <deploymentdescriptor
-         destdir="${build.resources}/cmp2/fkstackoverflow/META-INF"
-         validatexml="${validatexml}"/>
-       <jboss
-         version="3.2"
-         xmlencoding="UTF-8"
-         destdir="${build.resources}/cmp2/fkstackoverflow/META-INF"
-         validatexml="${validatexml}"/>
-     </ejbdoclet>
-
-     <!-- dbindex and post-table-create tests -->
-     <mkdir dir="${build.resources}/cmp2/idxandusersql/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.etc}/cmp2/idxandusersql">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/cmp2/idxandusersql/ejb/*Bean.java"/>
-       </fileset>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <entitypk/>
-       <utilobject cacheHomes="true" includeGUID="false"/>
-       <entitycmp/>
-       <session/>
-       <!--  Don't build the DD, haswe have our own one
-             prepared. Can change in the future if the
-             jboss-xdoclet supports dbindex etc.
-       <deploymentdescriptor
-          destdir="${build.resources}/cmp2/idxandusersql/META-INF"
-          validatexml="${validatexml}"/>
-       <jboss
-          version="3.2"
-          xmlencoding="UTF-8"
-          destdir="${build.resources}/cmp2/idxandusersql/META-INF"
-          validatexml="${validatexml}"/>
-       -->
-     </ejbdoclet>
-
-     <!-- ejbselect tests -->
-     <mkdir dir="${build.resources}/cmp2/ejbselect/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.etc}/cmp2/ejbselect">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/cmp2/ejbselect/*Bean.java"/>
-       </fileset>
-       <localinterface/>
-       <localhomeinterface/>
-       <entitypk/>
-       <utilobject cacheHomes="true" includeGUID="false"/>
-       <entitycmp/>
-       <session/>
-       <deploymentdescriptor
-         destdir="${build.resources}/cmp2/ejbselect/META-INF"
-         validatexml="${validatexml}"/>
-       <jboss
-         version="3.2"
-         xmlencoding="UTF-8"
-         destdir="${build.resources}/cmp2/ejbselect/META-INF"
-         validatexml="${validatexml}"/>
-     </ejbdoclet>
-
-     <!-- cmp2 relationship stress tests -->
-     <mkdir dir="${build.resources}/cmp2/cmrstress/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.resources}/cmp2/cmrstress">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/cmp2/cmrstress/ejb/*Bean.java"/>
-       </fileset>
-       <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <utilobject cacheHomes="true" includeGUID="false" kind="physical"/>
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/cmp2/cmrstress/META-INF"/>
-       <jboss xmlencoding="UTF-8"
-         version="3.0"
-         destdir="${build.resources}/cmp2/cmrstress/META-INF"
-         datasource="java:/DefaultDS"
-         datasourceMapping="Hypersonic SQL"
-         />
-     </ejbdoclet>
-
-     <!-- cmp2 enum tests -->
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.resources}/cmp2/enums">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/cmp2/enums/ejb/*Bean.java"/>
-       </fileset>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <utilobject cacheHomes="true" includeGUID="false" kind="physical"/>
-     </ejbdoclet>
-
-     <!--undeploy of broken packages-->
-     <mkdir dir="${build.resources}/jmx/undeploy/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author">
-       <!--mergedir="${source.resources}/jmx/ejb"-->
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/jmx/ejb/Entity*Bean.java"/>
-       </fileset>
-       <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <!--session/-->
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/jmx/undeploy/META-INF"/>
-       <jboss xmlencoding="UTF-8"
-         version="3.0"
-         destdir="${build.resources}/jmx/undeploy/META-INF"
-         mergedir="${source.resources}/jmx/undeploy/"
-         Datasource="java:/DefaultDS"
-         Typemapping="Hypersonic SQL"
-         />
-     </ejbdoclet>
-
-     <!-- Foe-Deployer: Simple Test -->
-     <mkdir dir="${build.resources}/foedeployer/simple/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/foedeployer/ejb/simple/*Bean.java"/>
-       </fileset>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/foedeployer/simple/META-INF"/>
-       <weblogic version="6.1"
-         xmlencoding="UTF-8"
-         destdir="${build.resources}/foedeployer/simple/META-INF"
-         validatexml="true"
-         createtables="True"
-         datasource="java:/DefaultDS"
-         mergedir="${source.resources}/foedeployer/"/>
-       <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
-     </ejbdoclet>
-
-     <!-- Foe-Deployer: Message Test -->
-     <mkdir dir="${build.resources}/foedeployer/message/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/foedeployer/ejb/message/*Bean.java"/>
-       </fileset>
-
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/foedeployer/message/META-INF"/>
-       <weblogic version="6.1"
-         xmlencoding="UTF-8"
-         destdir="${build.resources}/foedeployer/message/META-INF"
-         validatexml="true"
-         datasource="java:/DefaultDS"
-         mergedir="${source.resources}/foedeployer/"/>
-       <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
-     </ejbdoclet>
-
-     <!-- Foe-Deployer: O2MB Test -->
-     <mkdir dir="${build.resources}/foedeployer/o2mb/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/foedeployer/ejb/o2mb/*Bean.java"/>
-       </fileset>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/foedeployer/o2mb/META-INF"/>
-       <weblogic version="6.1"
-         xmlencoding="UTF-8"
-         destdir="${build.resources}/foedeployer/o2mb/META-INF"
-         validatexml="true"
-         createtables="True"
-         datasource="java:/DefaultDS"
-         mergedir="${source.resources}/foedeployer/"/>
-       <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
-     </ejbdoclet>
-
-     <!-- Foe-Deployer: M2MB Test -->
-     <mkdir dir="${build.resources}/foedeployer/m2mb/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/foedeployer/ejb/m2mb/*Bean.java"/>
-       </fileset>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/foedeployer/m2mb/META-INF"/>
-       <weblogic version="6.1"
-         xmlencoding="UTF-8"
-         destdir="${build.resources}/foedeployer/m2mb/META-INF"
-         validatexml="true"
-         createtables="True"
-         datasource="java:/DefaultDS"
-         mergedir="${source.resources}/foedeployer/"/>
-       <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
-     </ejbdoclet>
-
-     <!-- Foe-Deployer: QL Test -->
-     <mkdir dir="${build.resources}/foedeployer/ql/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/foedeployer/ejb/ql/*Bean.java"/>
-       </fileset>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/foedeployer/ql/META-INF"/>
-       <weblogic version="6.1"
-         xmlencoding="UTF-8"
-         destdir="${build.resources}/foedeployer/ql/META-INF"
-         validatexml="true"
-         createtables="True"
-         datasource="java:/DefaultDS"
-         mergedir="${source.resources}/foedeployer/"/>
-       <!-- No JBoss DD generation here because that is what we can to use FoeDeployer for -->
-     </ejbdoclet>
-
-     <!-- cpmanifest test -->
-     <mkdir dir="${build.resources}/jmx/loading/cpmanifest/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/jmx/loading/ConcreteBean.java"/>
-       </fileset>
-       <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-       <remoteinterface/>
-       <homeinterface/>
-       <!--session/-->
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/jmx/loading/cpmanifest/META-INF"/>
-     </ejbdoclet>
-
-     <!-- entity test -->
-     <mkdir dir="${build.resources}/entity/entity/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.resources}/entity/entity">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/entity/beans/*Bean.java"/>
-       </fileset>
-       <packageSubstitution packages="beans" substituteWith="interfaces"/>
-       <valueobject/>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <entitycmp/>
-       <utilobject kind="physical"/>
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/entity/entity/META-INF"/>
-       <jboss xmlencoding="UTF-8"
-         version="3.0"
-         datasource="java:/DefaultDS"
-         typemapping="Hypersonic SQL"
-         destdir="${build.resources}/entity/entity/META-INF"/>
-     </ejbdoclet>
-
-     <!-- aop test -->
-     <mkdir dir="${build.resources}/aop/simpleejb/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/aop/simpleejb/SimpleBean.java"/>
-       </fileset>
-       <remoteinterface/>
-       <homeinterface/>
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/aop/simpleejb/META-INF"/>
-       <jboss xmlencoding="UTF-8"
-         version="3.0"
-         destdir="${build.resources}/aop/simpleejb/META-INF"/>
-     </ejbdoclet>
-
-     <!-- aop xdoclet test - ->
-     <taskdef name="aopdoclet"
-              classname="xdoclet.modules.jboss.aop.JBossAopTask"
-              classpathref="tests.classpath"/>
-     <aopdoclet destdir="${build.resources}/aop/xdoclet/Advised">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/aop/xdoclet/Advised.java"/>
-       </fileset>
-       <jbossaop/>
-     </aopdoclet>
-     <aopdoclet destdir="${build.resources}/aop/xdoclet/ClassMetaData">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/aop/xdoclet/ClassMetaData.java"/>
-       </fileset>
-       <jbossaop/>
-     </aopdoclet>
-     <aopdoclet destdir="${build.resources}/aop/xdoclet/Intercepted">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/aop/xdoclet/Intercepted.java"/>
-         <include name="org/jboss/test/aop/xdoclet/BasicInterceptor.java"/>
-         <include name="org/jboss/test/aop/xdoclet/XmlLoadingInterceptor.java"/>
-         <include name="org/jboss/test/aop/xdoclet/XmlInterceptorFactory.java"/>
-       </fileset>
-       <jbossaop/>
-     </aopdoclet>
-     <aopdoclet destdir="${build.resources}/aop/xdoclet/NewIntercepted">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/aop/xdoclet/NewIntercepted.java"/>
-       </fileset>
-       <jbossaop/>
-     </aopdoclet>
-     <aopdoclet destdir="${build.resources}/aop/xdoclet/Introduced">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/aop/xdoclet/Introduced.java"/>
-       </fileset>
-       <jbossaop/>
-     </aopdoclet>
-     <aopdoclet destdir="${build.resources}/aop/xdoclet/NotAdvised">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/aop/xdoclet/NotAdvised.java"/>
-       </fileset>
-       <jbossaop/>
-     </aopdoclet>
-     <aopdoclet destdir="${build.resources}/aop/xdoclet/Secured">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/aop/xdoclet/Secured.java"/>
-       </fileset>
-       <configParam name="RunAs" value="Andy"/>
-       <jbossaop/>
-     </aopdoclet>
-     <aopdoclet destdir="${build.resources}/aop/xdoclet/Stack">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/aop/xdoclet/Stack.java"/>
-       </fileset>
-       <jbossaop/>
-     </aopdoclet>
-     <aopdoclet destdir="${build.resources}/aop/xdoclet/Transacted">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/aop/xdoclet/Transacted.java"/>
-       </fileset>
-       <jbossaop/>
-     </aopdoclet>
-     -->
-
-     <!-- cache test -->
-     <mkdir dir="${build.resources}/cache/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/cache/bean/*Bean.java"/>
-       </fileset>
-       <remoteinterface/>
-       <homeinterface/>
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/cache/META-INF"/>
-       <jboss xmlencoding="UTF-8"
-         version="3.0"
-         destdir="${build.resources}/cache/META-INF"/>
-     </ejbdoclet>
-
-     <!-- webservice/marshalltest test -->
-     <mkdir dir="${build.resources}/webservice/marshalltest/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/webservice/marshalltest/*BeanImpl.java"/>
-       </fileset>
-       <remoteinterface/>
-       <homeinterface/>
-     </ejbdoclet>
-   </target>
-
-   <target name="compile-mbean-sources" unless="noxdoclet">
-     <taskdef name="jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
-
-     <mkdir dir="${build.gen-src}"/>
-     <jmxdoclet destdir="${build.gen-src}"
-       force="true"
-       excludedtags="@version, at author">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/jmx/deployer/*.java"/>
-         <include name="org/jboss/test/jmx/invoker/*.java"/>
-         <include name="org/jboss/test/jmx/mbean/*.java"/>
-         <include name="org/jboss/test/jmx/missingclass/*.java"/>
-       </fileset>
-       <mbeaninterface mergedir="${project.tools}/etc/xdoclet/templates"/>
-       <!--mbeaninterface mergedir="${xdoclet.mergedir}"/-->
-     </jmxdoclet>
-   </target>
-
-   <target name="compile-xmbean-dds" unless="noxdoclet">
-     <taskdef name="jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
-     <echo message="xdoclet.mergedir: ${xdoclet.mergedir}"/>
-     <mkdir dir="${build.resources}/jmx/xmbean"/>
-     <jmxdoclet destdir="${build.resources}/jmx/xmbean"
-       force="true"
-       excludedtags="@version, at author">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/jmx/xmbean/*.java"/>
-       </fileset>
-       <jbossxmbean/>
-     </jmxdoclet>
-
-   </target>
-
-   <target name="compile-proxycompiler-bean-sources" unless="noxdoclet">
-     <taskdef name="ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" classpathref="xdoclet.task.classpath"/>
-
-     <mkdir dir="${build.gen-src}"/>
-
-     <mkdir dir="${build.resources}/proxycompiler/META-INF"/>
-     <ejbdoclet destdir="${build.gen-src}"
-       ejbspec="2.0"
-       excludedtags="@version, at author"
-       mergedir="${source.resources}/proxycompiler">
-       <fileset dir="${source.java}">
-         <include name="org/jboss/test/proxycompiler/beans/**/*Bean.java"/>
-       </fileset>
-       <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-       <remoteinterface/>
-       <localinterface/>
-       <homeinterface/>
-       <localhomeinterface/>
-       <!--session/-->
-       <deploymentdescriptor xmlencoding="UTF-8"
-         destdir="${build.resources}/proxycompiler/META-INF"/>
-       <jboss xmlencoding="UTF-8"
-         version="3.0"
-         destdir="${build.resources}/proxycompiler/META-INF"
-         mergedir="${source.resources}/proxycompiler"/>
-     </ejbdoclet>
-
-   </target>
-
-   <target name="help">
-      <echo message="The project fragment which defines the jboss server configs"/>
-   </target>
-
 </project>

Modified: trunk/testsuite/imports/sections/classloader.xml
===================================================================
--- trunk/testsuite/imports/sections/classloader.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/imports/sections/classloader.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -265,7 +265,8 @@
          </fileset>
       </jar>
       
-      <!-- Build version 2 of the singleton.jar -->
+      <!-- Build version 2 of the singleton.jar
+      Needs to be redone using javassit
       <delete
          dir="${build.classes}/org/jboss/test/classloader/scoping/singleton"/>
       <copy
@@ -286,7 +287,6 @@
             <filter token="VERSION" value="V2"/>
          </filterset>
       </copy>
-      
       <javac destdir="${build.classes}" optimize="${javac.optimize}"
          source="${javac.source}" target="${javac.target}"
          debug="${javac.debug}">
@@ -295,6 +295,7 @@
          <classpath refid="tests.classpath"/>
          <include name="org/jboss/test/classloader/scoping/singleton/**"/>
       </javac>
+   	-->
       <jar destfile="${build.lib}/singleton2.sar">
          <metainf
             dir="${build.classes}/org/jboss/test/classloader/scoping/singleton">

Modified: trunk/testsuite/imports/sections/cts.xml
===================================================================
--- trunk/testsuite/imports/sections/cts.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/imports/sections/cts.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -80,7 +80,9 @@
       <javac destdir="${build.classes}" optimize="${javac.optimize}"
          source="${javac.source}" target="${javac.target}"
          debug="${javac.debug}">
-         <src path="${build.gen-src}"/>
+         <!-- Need to use javasist
+         src path="${build.gen-src}"/
+         -->
          <src path="${source.java}"/>
          <classpath refid="tests.classpath"/>
          <include name="org/jboss/test/cts/**"/>
@@ -147,7 +149,9 @@
       <javac destdir="${build.classes}" optimize="${javac.optimize}"
          source="${javac.source}" target="${javac.target}"
          debug="${javac.debug}">
-         <src path="${build.gen-src}"/>
+         <!-- Need to use javassit
+         src path="${build.gen-src}"/
+         -->
          <src path="${source.java}"/>
          <classpath refid="tests.classpath"/>
          <include name="org/jboss/test/cts/**"/>

Deleted: trunk/testsuite/imports/sections/foedeployer.xml
===================================================================
--- trunk/testsuite/imports/sections/foedeployer.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/imports/sections/foedeployer.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -1,64 +0,0 @@
-<project name="tests-foedeployer-jars">
-   <!-- foe-deployer test -->
-   <target name="_jars-foedeployer">
-      <mkdir dir="${build.lib}"/>
-      
-      <!-- First task is to copy the Foe-Deployer SAR to the current lib directory -->
-      <echo>${project.root}</echo>
-      <copy todir="${build.lib}" filtering="no">
-         <fileset dir="${project.root}/varia/output/lib">
-            <include name="foe-deployer-3.2.sar"/>
-         </fileset>
-      </copy>
-      
-      <!-- build foe-deployer-simple-test.wlar -->
-      <jar destfile="${build.lib}/foe-deployer-simple-test.wlar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/test/foedeployer/ejb/simple/**"/>
-         </fileset>
-         <fileset dir="${build.resources}/foedeployer/simple/">
-            <include name="META-INF/**"/>
-         </fileset>
-      </jar>
-      
-      <!-- build foe-deployer-message-test.wlar -->
-      <jar destfile="${build.lib}/foe-deployer-message-test.wlar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/test/foedeployer/ejb/message/**"/>
-         </fileset>
-         <fileset dir="${build.resources}/foedeployer/message/">
-            <include name="META-INF/**"/>
-         </fileset>
-      </jar>
-      
-      <!-- build foe-deployer-o2mb-test.wlar -->
-      <jar destfile="${build.lib}/foe-deployer-o2mb-test.wlar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/test/foedeployer/ejb/o2mb/**"/>
-         </fileset>
-         <fileset dir="${build.resources}/foedeployer/o2mb/">
-            <include name="META-INF/**"/>
-         </fileset>
-      </jar>
-      
-      <!-- build foe-deployer-m2mb-test.wlar -->
-      <jar destfile="${build.lib}/foe-deployer-m2mb-test.wlar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/test/foedeployer/ejb/m2mb/**"/>
-         </fileset>
-         <fileset dir="${build.resources}/foedeployer/m2mb/">
-            <include name="META-INF/**"/>
-         </fileset>
-      </jar>
-      
-      <!-- build foe-deployer-ql-test.wlar -->
-      <jar destfile="${build.lib}/foe-deployer-ql-test.wlar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/test/foedeployer/ejb/ql/**"/>
-         </fileset>
-         <fileset dir="${build.resources}/foedeployer/ql/">
-            <include name="META-INF/**"/>
-         </fileset>
-      </jar>
-   </target>
-</project>

Modified: trunk/testsuite/imports/test-jars.xml
===================================================================
--- trunk/testsuite/imports/test-jars.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/imports/test-jars.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -24,7 +24,6 @@
    <import file="sections/ejbconf.xml"/>
    <import file="sections/entity.xml"/>
    <import file="sections/exception.xml"/>
-   <import file="sections/foedeployer.xml"/>
    <import file="sections/hello.xml"/>
    <import file="sections/hibernate.xml"/>
    <import file="sections/httpsessionreplication.xml"/>
@@ -101,7 +100,6 @@
         _jars-entityexc,
         _jars-excepiiop,
         _jars-exception,
-        _jars-foedeployer,
         _jars-hello,
         _jars-helloiiop,
         _jars-hellojrmpiiop,

Added: trunk/testsuite/src/main/org/jboss/test/aop/simpleejb/Simple.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/simpleejb/Simple.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/aop/simpleejb/Simple.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,16 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.aop.simpleejb;
+
+/**
+ * Remote interface for test/Simple.
+ */
+public interface Simple
+   extends javax.ejb.EJBObject
+{
+
+   public java.lang.String getTest(  )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/aop/simpleejb/SimpleHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/simpleejb/SimpleHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/aop/simpleejb/SimpleHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.aop.simpleejb;
+
+/**
+ * Home interface for test/Simple.
+ */
+public interface SimpleHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/test/Simple";
+   public static final String JNDI_NAME="ejb/test/Simple";
+
+   public org.jboss.test.aop.simpleejb.Simple create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cache/bean/CacheObjectMeanTester.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cache/bean/CacheObjectMeanTester.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cache/bean/CacheObjectMeanTester.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,16 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cache.bean;
+
+/**
+ * Remote interface for CacheObjectMeanTester.
+ */
+public interface CacheObjectMeanTester
+   extends javax.ejb.EJBObject
+{
+
+   public void bind( java.lang.String id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cache/bean/CacheObjectMeanTesterHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cache/bean/CacheObjectMeanTesterHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cache/bean/CacheObjectMeanTesterHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cache.bean;
+
+/**
+ * Home interface for CacheObjectMeanTester.
+ */
+public interface CacheObjectMeanTesterHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/CacheObjectMeanTester";
+   public static final String JNDI_NAME="test/CacheObjectMeanTester";
+
+   public org.jboss.test.cache.bean.CacheObjectMeanTester create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopMBeanTester.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopMBeanTester.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopMBeanTester.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,85 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cache.bean;
+
+/**
+ * Remote interface for test/TreeCacheAopMBeanTester.
+ */
+public interface TreeCacheAopMBeanTester
+   extends javax.ejb.EJBObject
+{
+
+   public void createPerson( java.lang.String key,java.lang.String name,int age )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void removePerson( java.lang.String key )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setName( java.lang.String key,java.lang.String name )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.String getName( java.lang.String key )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setAge( java.lang.String key,int age )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public int getAge( java.lang.String key )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setStreet( java.lang.String key,java.lang.String street )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.String getStreet( java.lang.String key )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setCity( java.lang.String key,java.lang.String city )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.String getCity( java.lang.String key )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setZip( java.lang.String key,int zip )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public int getZip( java.lang.String key )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.Object getHobby( java.lang.String key,java.lang.Object hobbyKey )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setHobby( java.lang.String key,java.lang.Object hobbyKey,java.lang.Object value )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.Object getLanguage( java.lang.String key,int index )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void addLanguage( java.lang.String key,java.lang.Object language )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void removeLanguage( java.lang.String key,java.lang.Object language )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public int getLanguagesSize( java.lang.String key )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.util.Set getSkills( java.lang.String key )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void addSkill( java.lang.String key,java.lang.String skill )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void removeSkill( java.lang.String key,java.lang.String skill )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void printPerson( java.lang.String key )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void printCache(  )
+      throws java.rmi.RemoteException;
+
+   public java.lang.Object getFieldValue( java.lang.String key,java.lang.String name )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopMBeanTesterHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopMBeanTesterHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopMBeanTesterHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cache.bean;
+
+/**
+ * Home interface for test/TreeCacheAopMBeanTester.
+ */
+public interface TreeCacheAopMBeanTesterHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/test/TreeCacheAopMBeanTester";
+   public static final String JNDI_NAME="ejb/test/TreeCacheAopMBeanTester";
+
+   public org.jboss.test.cache.bean.TreeCacheAopMBeanTester create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopTester.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopTester.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopTester.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,94 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cache.bean;
+
+/**
+ * Remote interface for test/TreeCacheAopTester.
+ */
+public interface TreeCacheAopTester
+   extends javax.ejb.EJBObject
+{
+
+   public void testSetup(  )
+      throws java.rmi.RemoteException;
+
+   public void createPerson( java.lang.String key,java.lang.String name,int age )
+      throws java.rmi.RemoteException;
+
+   public void removePerson( java.lang.String key )
+      throws java.rmi.RemoteException;
+
+   public void setName( java.lang.String key,java.lang.String name )
+      throws java.rmi.RemoteException;
+
+   public java.lang.String getName( java.lang.String key )
+      throws java.rmi.RemoteException;
+
+   public void setAge( java.lang.String key,int age )
+      throws java.rmi.RemoteException;
+
+   public int getAge( java.lang.String key )
+      throws java.rmi.RemoteException;
+
+   public void setStreet( java.lang.String key,java.lang.String street )
+      throws java.rmi.RemoteException;
+
+   public java.lang.String getStreet( java.lang.String key )
+      throws java.rmi.RemoteException;
+
+   public void setCity( java.lang.String key,java.lang.String city )
+      throws java.rmi.RemoteException;
+
+   public java.lang.String getCity( java.lang.String key )
+      throws java.rmi.RemoteException;
+
+   public void setZip( java.lang.String key,int zip )
+      throws java.rmi.RemoteException;
+
+   public int getZip( java.lang.String key )
+      throws java.rmi.RemoteException;
+
+   public java.lang.Object getHobby( java.lang.String key,java.lang.Object hobbyKey )
+      throws java.rmi.RemoteException;
+
+   public void setHobby( java.lang.String key,java.lang.Object hobbyKey,java.lang.Object value )
+      throws java.rmi.RemoteException;
+
+   public java.lang.Object getLanguage( java.lang.String key,int index )
+      throws java.rmi.RemoteException;
+
+   public void addLanguage( java.lang.String key,java.lang.Object language )
+      throws java.rmi.RemoteException;
+
+   public void removeLanguage( java.lang.String key,java.lang.Object language )
+      throws java.rmi.RemoteException;
+
+   public int getLanguagesSize( java.lang.String key )
+      throws java.rmi.RemoteException;
+
+   public java.util.Set getSkills( java.lang.String key )
+      throws java.rmi.RemoteException;
+
+   public void addSkill( java.lang.String key,java.lang.String skill )
+      throws java.rmi.RemoteException;
+
+   public void removeSkill( java.lang.String key,java.lang.String skill )
+      throws java.rmi.RemoteException;
+
+   public java.lang.Object testSerialization(  )
+      throws java.rmi.RemoteException;
+
+   public void testDeserialization( java.lang.String key,java.lang.Object value )
+      throws java.rmi.RemoteException;
+
+   public void printPerson( java.lang.String key )
+      throws java.rmi.RemoteException;
+
+   public void printCache(  )
+      throws java.rmi.RemoteException;
+
+   public java.lang.Object getFieldValue( java.lang.String key,java.lang.String name )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopTesterHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopTesterHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheAopTesterHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cache.bean;
+
+/**
+ * Home interface for test/TreeCacheAopTester.
+ */
+public interface TreeCacheAopTesterHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/test/TreeCacheAopTester";
+   public static final String JNDI_NAME="test/TreeCacheAopTester";
+
+   public org.jboss.test.cache.bean.TreeCacheAopTester create(java.lang.String cluster_name , java.lang.String props , int caching_mode)
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheMBeanTester.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheMBeanTester.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheMBeanTester.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,70 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cache.bean;
+
+/**
+ * Remote interface for test/TreeCacheMBeanTester.
+ */
+public interface TreeCacheMBeanTester
+   extends javax.ejb.EJBObject
+{
+
+   public java.util.Vector getMembers(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public int getCacheMode(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setCacheMode( int mode )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public boolean getLocking(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setLocking( boolean flag )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public int getLockingLevel(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setLocking( int level )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.util.Set getKeys( java.lang.String fqn )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.Object get( java.lang.String fqn,java.lang.String key )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public boolean exists( java.lang.String fqn )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void put( java.lang.String fqn,java.util.Map data )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void put( java.lang.String fqn,java.lang.String key,java.lang.Object value )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void remove( java.lang.String fqn )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.Object remove( java.lang.String fqn,java.lang.String key )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void releaseAllLocks( java.lang.String fqn )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.String print( java.lang.String fqn )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.util.Set getChildrenNames( java.lang.String fqn )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.String printDetails(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.String printLockInfo(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheMBeanTesterHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheMBeanTesterHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheMBeanTesterHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cache.bean;
+
+/**
+ * Home interface for test/TreeCacheMBeanTester.
+ */
+public interface TreeCacheMBeanTesterHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/test/TreeCacheMBeanTester";
+   public static final String JNDI_NAME="ejb/test/TreeCacheMBeanTester";
+
+   public org.jboss.test.cache.bean.TreeCacheMBeanTester create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+   public org.jboss.test.cache.bean.TreeCacheMBeanTester create(java.lang.String name)
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheTester.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheTester.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheTester.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,58 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cache.bean;
+
+/**
+ * Remote interface for test/TreeCacheTester.
+ */
+public interface TreeCacheTester
+   extends javax.ejb.EJBObject
+{
+
+   public java.util.Vector getMembers(  )
+      throws java.rmi.RemoteException;
+
+   public void setCacheMode( int mode )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setIsolationLevel( org.jboss.cache.lock.IsolationLevel level )
+      throws java.rmi.RemoteException;
+
+   public java.util.Set getKeys( java.lang.String fqn )
+      throws org.jboss.cache.CacheException, java.rmi.RemoteException;
+
+   public java.lang.Object get( java.lang.String fqn,java.lang.String key )
+      throws org.jboss.cache.CacheException, java.rmi.RemoteException;
+
+   public boolean exists( java.lang.String fqn )
+      throws java.rmi.RemoteException;
+
+   public void put( java.lang.String fqn,java.util.Map data )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.Object put( java.lang.String fqn,java.lang.String key,java.lang.Object value )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void remove( java.lang.String fqn )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.Object remove( java.lang.String fqn,java.lang.String key )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void releaseAllLocks( java.lang.String fqn )
+      throws java.rmi.RemoteException;
+
+   public java.lang.String print( java.lang.String fqn )
+      throws java.rmi.RemoteException;
+
+   public java.util.Set getChildrenNames( java.lang.String fqn )
+      throws org.jboss.cache.CacheException, java.rmi.RemoteException;
+
+   public java.lang.String printDetails(  )
+      throws java.rmi.RemoteException;
+
+   public java.lang.String printLockInfo(  )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheTesterHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheTesterHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cache/bean/TreeCacheTesterHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cache.bean;
+
+/**
+ * Home interface for test/TreeCacheTester.
+ */
+public interface TreeCacheTesterHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/test/TreeCacheTester";
+   public static final String JNDI_NAME="ejb/test/TreeCacheTester";
+
+   public org.jboss.test.cache.bean.TreeCacheTester create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+   public org.jboss.test.cache.bean.TreeCacheTester create(java.lang.String cluster_name , java.lang.String props , int caching_mode)
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/classloader/scoping/singleton/MySingleton.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/scoping/singleton/MySingleton.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/scoping/singleton/MySingleton.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,31 @@
+package org.jboss.test.classloader.scoping.singleton;
+
+/** A singleton class for testing singleton versioning
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 16662 $
+ */
+public class MySingleton
+{
+   private static MySingleton instance;
+
+   private String version;
+
+   public static MySingleton getInstance()
+   {
+      if( instance == null )
+      {
+         instance = new MySingleton("V2");
+      }
+      return instance;
+   }
+
+   private MySingleton(String version)
+   {
+      this.version = version;
+   }
+
+   public String getVersion()
+   {
+      return version;
+   }
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugEJBLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugEJBLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugEJBLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,82 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmr.interfaces;
+
+/**
+ * Local interface for CMRBugEJB.
+ */
+public interface CMRBugEJBLocal
+   extends javax.ejb.EJBLocalObject
+{
+   /**
+    * Describe <code>getId</code> method here.
+    * @return a <code>String</code> value
+    */
+   public java.lang.String getId(  ) ;
+
+   /**
+    * Describe <code>setId</code> method here.
+    * @param id a <code>String</code> value
+    */
+   public void setId( java.lang.String id ) ;
+
+   /**
+    * Describe <code>getDescription</code> method here.
+    * @return a <code>String</code> value
+    */
+   public java.lang.String getDescription(  ) ;
+
+   /**
+    * Describe <code>setDescription</code> method here.
+    * @param description a <code>String</code> value
+    */
+   public void setDescription( java.lang.String description ) ;
+
+   /**
+    * Describe <code>getParent</code> method here.
+    * @return a <code>CMRBugEJBLocal</code> value
+    */
+   public org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal getParent(  ) ;
+
+   /**
+    * Describe <code>setParent</code> method here.
+    * @param parent a <code>CMRBugEJBLocal</code> value
+    */
+   public void setParent( org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal parent ) ;
+
+   /**
+    * Describe <code>getChildren</code> method here.
+    * @return a <code>Collection</code> value
+    */
+   public java.util.Collection getChildren(  ) ;
+
+   /**
+    * Describe <code>setChildren</code> method here.
+    * @param children a <code>Collection</code> value
+    */
+   public void setChildren( java.util.Collection children ) ;
+
+   /**
+    * Describe <code>addChild</code> method here.
+    * @param child a <code>CMRBugEJBLocal</code> value
+    * @return a <code>boolean</code> value
+    */
+   public boolean addChild( org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal child ) ;
+
+   /**
+    * Describe <code>removeChild</code> method here.
+    * @param child a <code>CMRBugEJBLocal</code> value
+    * @return a <code>boolean</code> value
+    */
+   public boolean removeChild( org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal child ) ;
+
+   public org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal getPrevNode(  ) ;
+
+   public void setPrevNode( org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal a_ViewComponent ) ;
+
+   public org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal getNextNode(  ) ;
+
+   public void setNextNode( org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal a_ViewComponent ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugEJBLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugEJBLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugEJBLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,24 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmr.interfaces;
+
+/**
+ * Local home interface for CMRBugEJB.
+ */
+public interface CMRBugEJBLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/CMRBugEJBLocal";
+   public static final String JNDI_NAME="LocalReadOnly";
+
+   public org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal create(java.lang.String id , java.lang.String description , org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal parent)
+      throws javax.ejb.CreateException;
+
+   public java.util.Collection findAll()
+      throws javax.ejb.FinderException;
+
+   public org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal findByPrimaryKey(java.lang.String pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJB.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJB.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJB.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,39 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmr.interfaces;
+
+/**
+ * Remote interface for CMRBugManagerEJB.
+ */
+public interface CMRBugManagerEJB
+   extends javax.ejb.EJBObject
+{
+   /**
+    * Describe <code>createCMRBugs</code> method here.
+    * @param cmrBugs a <code>SortedMap</code> value
+    */
+   public void createCMRBugs( java.util.SortedMap cmrBugs )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Describe <code>getParentFor</code> method here.
+    * @param id a <code>String</code> value
+    * @return a <code>String[]</code> value
+    */
+   public java.lang.String[] getParentFor( java.lang.String id )
+      throws java.rmi.RemoteException;
+
+   public void setupLoadFKState(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void moveLastNodeBack(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public boolean lastHasNextNode(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void tearDownLoadFKState(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJBHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJBHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJBHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmr.interfaces;
+
+/**
+ * Home interface for CMRBugManagerEJB.
+ */
+public interface CMRBugManagerEJBHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/CMRBugManagerEJB";
+   public static final String JNDI_NAME="CMRBugManager";
+
+   public org.jboss.test.cmp2.cmr.interfaces.CMRBugManagerEJB create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJBLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJBLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJBLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmr.interfaces;
+
+/**
+ * Local interface for CMRBugManagerEJB.
+ */
+public interface CMRBugManagerEJBLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public void setupLoadFKState(  ) throws java.lang.Exception;
+
+   public void moveLastNodeBack(  ) throws java.lang.Exception;
+
+   public boolean lastHasNextNode(  ) throws java.lang.Exception;
+
+   public void tearDownLoadFKState(  ) throws java.lang.Exception;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJBLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJBLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmr/interfaces/CMRBugManagerEJBLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmr.interfaces;
+
+/**
+ * Local home interface for CMRBugManagerEJB.
+ */
+public interface CMRBugManagerEJBLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/CMRBugManagerEJBLocal";
+   public static final String JNDI_NAME="CMRBugManagerEJBLocal";
+
+   public org.jboss.test.cmp2.cmr.interfaces.CMRBugManagerEJBLocal create()
+      throws javax.ejb.CreateException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ChildLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ChildLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ChildLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,42 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrstress.interfaces;
+
+/**
+ * Local interface for Child.
+ */
+public interface ChildLocal
+   extends javax.ejb.EJBLocalObject
+{
+   /**
+    * CMP get method for Id attribute.
+    */
+   public java.lang.String getId(  ) ;
+
+   /**
+    * CMP set method for Id attribute.
+    */
+   public void setId( java.lang.String id ) ;
+
+   /**
+    * CMP get method for Name attribute.
+    */
+   public java.lang.String getName(  ) ;
+
+   /**
+    * CMP set method for Name attribute.
+    */
+   public void setName( java.lang.String name ) ;
+
+   /**
+    * CMP get method for Value attribute.
+    */
+   public java.lang.String getValue(  ) ;
+
+   /**
+    * CMP set method for Value attribute.
+    */
+   public void setValue( java.lang.String value ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ChildLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ChildLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ChildLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrstress.interfaces;
+
+/**
+ * Local home interface for Child.
+ */
+public interface ChildLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ChildLocal";
+   public static final String JNDI_NAME="ChildLocal";
+
+   public org.jboss.test.cmp2.cmrstress.interfaces.ChildLocal create(java.lang.String id , java.lang.String name , java.lang.String value)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.cmrstress.interfaces.ChildLocal findByPrimaryKey(java.lang.String pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ChildUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ChildUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ChildUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrstress.interfaces;
+
+/**
+ * Utility class for Child.
+ */
+public class ChildUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.cmrstress.interfaces.ChildLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for Child. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.cmrstress.interfaces.ChildLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.cmrstress.interfaces.ChildLocalHome) initialContext.lookup(org.jboss.test.cmp2.cmrstress.interfaces.ChildLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/Parent.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/Parent.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/Parent.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,48 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrstress.interfaces;
+
+/**
+ * Remote interface for Parent.
+ */
+public interface Parent
+   extends javax.ejb.EJBObject
+{
+   /**
+    * CMP get method for Id attribute.
+    */
+   public java.lang.String getId(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * CMP set method for Id attribute.
+    */
+   public void setId( java.lang.String id )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Get Children that apply to this Parent.
+    */
+   public java.util.Set getChildren(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Set Children.
+    */
+   public void setChildren( java.util.Set children )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Get a map of Child values. This is the current axis of evil.
+    */
+   public java.util.Map getPropertyMap(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Adds a child bean with the given attributes to this bean.
+    */
+   public void addChild( int k,java.lang.String field1,java.lang.String field2 )
+      throws javax.ejb.CreateException, java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrstress.interfaces;
+
+/**
+ * Home interface for Parent.
+ */
+public interface ParentHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/Parent";
+   public static final String JNDI_NAME="cmrstress/Parent";
+
+   public org.jboss.test.cmp2.cmrstress.interfaces.Parent create(java.lang.String id)
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+   public org.jboss.test.cmp2.cmrstress.interfaces.Parent findByPrimaryKey(java.lang.String pk)
+      throws javax.ejb.FinderException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,13 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrstress.interfaces;
+
+/**
+ * Local interface for Parent.
+ */
+public interface ParentLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrstress.interfaces;
+
+/**
+ * Local home interface for Parent.
+ */
+public interface ParentLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ParentLocal";
+   public static final String JNDI_NAME="ParentLocal";
+
+   public org.jboss.test.cmp2.cmrstress.interfaces.ParentLocal findByPrimaryKey(java.lang.String pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrstress/interfaces/ParentUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,74 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrstress.interfaces;
+
+/**
+ * Utility class for Parent.
+ */
+public class ParentUtil
+{
+   /** Cached remote home (EJBHome). Uses lazy loading to obtain its value (loaded by getHome() methods). */
+   private static org.jboss.test.cmp2.cmrstress.interfaces.ParentHome cachedRemoteHome = null;
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.cmrstress.interfaces.ParentLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain remote home interface from default initial context
+    * @return Home interface for Parent. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.cmrstress.interfaces.ParentHome getHome() throws javax.naming.NamingException
+   {
+      if (cachedRemoteHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            java.lang.Object objRef = initialContext.lookup(org.jboss.test.cmp2.cmrstress.interfaces.ParentHome.JNDI_NAME);
+            cachedRemoteHome = (org.jboss.test.cmp2.cmrstress.interfaces.ParentHome) javax.rmi.PortableRemoteObject.narrow(objRef, org.jboss.test.cmp2.cmrstress.interfaces.ParentHome.class);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedRemoteHome;
+   }
+
+   /**
+    * Obtain remote home interface from parameterised initial context
+    * @param environment Parameters to use for creating initial context
+    * @return Home interface for Parent. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.cmrstress.interfaces.ParentHome getHome( java.util.Hashtable environment ) throws javax.naming.NamingException
+   {
+      // Obtain initial context
+      javax.naming.InitialContext initialContext = new javax.naming.InitialContext(environment);
+      try {
+         java.lang.Object objRef = initialContext.lookup(org.jboss.test.cmp2.cmrstress.interfaces.ParentHome.JNDI_NAME);
+         return (org.jboss.test.cmp2.cmrstress.interfaces.ParentHome) javax.rmi.PortableRemoteObject.narrow(objRef, org.jboss.test.cmp2.cmrstress.interfaces.ParentHome.class);
+      } finally {
+         initialContext.close();
+      }
+   }
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for Parent. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.cmrstress.interfaces.ParentLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.cmrstress.interfaces.ParentLocalHome) initialContext.lookup(org.jboss.test.cmp2.cmrstress.interfaces.ParentLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/ALocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/ALocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/ALocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,25 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrtree.ejb;
+
+/**
+ * Local interface for A.
+ */
+public interface ALocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public int getMajorId(  ) ;
+
+   public java.lang.String getMinorId(  ) ;
+
+   public java.lang.String getName(  ) ;
+
+   public void setName( java.lang.String name ) ;
+
+   public java.util.Collection getB(  ) ;
+
+   public void setB( java.util.Collection c ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/ALocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/ALocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/ALocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrtree.ejb;
+
+/**
+ * Local home interface for A.
+ */
+public interface ALocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ALocal";
+   public static final String JNDI_NAME="ALocal";
+
+   public org.jboss.test.cmp2.cmrtree.ejb.ALocal create(int id , java.lang.String id2 , java.lang.String name)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.cmrtree.ejb.ALocal findByPrimaryKey(org.jboss.test.cmp2.cmrtree.ejb.APK pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/APK.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/APK.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/APK.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,109 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrtree.ejb;
+
+/**
+ * Primary key for A.
+ */
+public class APK
+   extends java.lang.Object
+   implements java.io.Serializable
+{
+   private int _hashCode = 0;
+   private StringBuffer _toStringValue = null;
+
+   public int majorId;
+   public java.lang.String minorId;
+
+   public APK()
+   {
+   }
+
+   public APK( int majorId,java.lang.String minorId )
+   {
+      this.majorId = majorId;
+      this.minorId = minorId;
+   }
+
+   public int getMajorId()
+   {
+      return majorId;
+   }
+   public java.lang.String getMinorId()
+   {
+      return minorId;
+   }
+
+   public void setMajorId(int majorId)
+   {
+      this.majorId = majorId;
+      _hashCode = 0;
+   }
+   public void setMinorId(java.lang.String minorId)
+   {
+      this.minorId = minorId;
+      _hashCode = 0;
+   }
+
+   public int hashCode()
+   {
+      if( _hashCode == 0 )
+      {
+         _hashCode += (int)this.majorId;
+         if (this.minorId != null) _hashCode += this.minorId.hashCode();
+      }
+
+      return _hashCode;
+   }
+
+   public boolean equals(Object obj)
+   {
+      if( !(obj instanceof org.jboss.test.cmp2.cmrtree.ejb.APK) )
+         return false;
+
+      org.jboss.test.cmp2.cmrtree.ejb.APK pk = (org.jboss.test.cmp2.cmrtree.ejb.APK)obj;
+      boolean eq = true;
+
+      if( obj == null )
+      {
+         eq = false;
+      }
+      else
+      {
+         eq = eq && this.majorId == pk.majorId;
+         if( this.minorId == null && ((org.jboss.test.cmp2.cmrtree.ejb.APK)obj).getMinorId() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.minorId == null || ((org.jboss.test.cmp2.cmrtree.ejb.APK)obj).getMinorId() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.minorId.equals( pk.minorId );
+            }
+         }
+      }
+
+      return eq;
+   }
+
+   /** @return String representation of this pk in the form of [.field1.field2.field3]. */
+   public String toString()
+   {
+      if( _toStringValue == null )
+      {
+         _toStringValue = new StringBuffer("[.");
+         _toStringValue.append(this.majorId).append('.');
+         _toStringValue.append(this.minorId).append('.');
+         _toStringValue.append(']');
+      }
+
+      return _toStringValue.toString();
+   }
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/AUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/AUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/AUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrtree.ejb;
+
+/**
+ * Utility class for A.
+ */
+public class AUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.cmrtree.ejb.ALocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for A. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.cmrtree.ejb.ALocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.cmrtree.ejb.ALocalHome) initialContext.lookup(org.jboss.test.cmp2.cmrtree.ejb.ALocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,41 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrtree.ejb;
+
+/**
+ * Local interface for B.
+ */
+public interface BLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public int getMajorId(  ) ;
+
+   public java.lang.String getMinorId(  ) ;
+
+   public java.lang.String getName(  ) ;
+
+   public void setName( java.lang.String id ) ;
+
+   public java.lang.String getAMinorId(  ) ;
+
+   public void setAMinorId( java.lang.String aid ) ;
+
+   public java.lang.String getParentBMinorId(  ) ;
+
+   public void setParentBMinorId( java.lang.String bid ) ;
+
+   public java.util.Collection getChildren(  ) ;
+
+   public void setChildren( java.util.Collection c ) ;
+
+   public org.jboss.test.cmp2.cmrtree.ejb.BLocal getParent(  ) ;
+
+   public void setParent( org.jboss.test.cmp2.cmrtree.ejb.BLocal a ) ;
+
+   public org.jboss.test.cmp2.cmrtree.ejb.ALocal getA(  ) ;
+
+   public void setA( org.jboss.test.cmp2.cmrtree.ejb.ALocal a ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrtree.ejb;
+
+/**
+ * Local home interface for B.
+ */
+public interface BLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/BLocal";
+   public static final String JNDI_NAME="BLocal";
+
+   public org.jboss.test.cmp2.cmrtree.ejb.BLocal create(int majorId , java.lang.String minorId , java.lang.String name)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.cmrtree.ejb.BLocal findByPrimaryKey(org.jboss.test.cmp2.cmrtree.ejb.BPK pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BPK.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BPK.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BPK.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,109 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrtree.ejb;
+
+/**
+ * Primary key for B.
+ */
+public class BPK
+   extends java.lang.Object
+   implements java.io.Serializable
+{
+   private int _hashCode = 0;
+   private StringBuffer _toStringValue = null;
+
+   public int majorId;
+   public java.lang.String minorId;
+
+   public BPK()
+   {
+   }
+
+   public BPK( int majorId,java.lang.String minorId )
+   {
+      this.majorId = majorId;
+      this.minorId = minorId;
+   }
+
+   public int getMajorId()
+   {
+      return majorId;
+   }
+   public java.lang.String getMinorId()
+   {
+      return minorId;
+   }
+
+   public void setMajorId(int majorId)
+   {
+      this.majorId = majorId;
+      _hashCode = 0;
+   }
+   public void setMinorId(java.lang.String minorId)
+   {
+      this.minorId = minorId;
+      _hashCode = 0;
+   }
+
+   public int hashCode()
+   {
+      if( _hashCode == 0 )
+      {
+         _hashCode += (int)this.majorId;
+         if (this.minorId != null) _hashCode += this.minorId.hashCode();
+      }
+
+      return _hashCode;
+   }
+
+   public boolean equals(Object obj)
+   {
+      if( !(obj instanceof org.jboss.test.cmp2.cmrtree.ejb.BPK) )
+         return false;
+
+      org.jboss.test.cmp2.cmrtree.ejb.BPK pk = (org.jboss.test.cmp2.cmrtree.ejb.BPK)obj;
+      boolean eq = true;
+
+      if( obj == null )
+      {
+         eq = false;
+      }
+      else
+      {
+         eq = eq && this.majorId == pk.majorId;
+         if( this.minorId == null && ((org.jboss.test.cmp2.cmrtree.ejb.BPK)obj).getMinorId() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.minorId == null || ((org.jboss.test.cmp2.cmrtree.ejb.BPK)obj).getMinorId() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.minorId.equals( pk.minorId );
+            }
+         }
+      }
+
+      return eq;
+   }
+
+   /** @return String representation of this pk in the form of [.field1.field2.field3]. */
+   public String toString()
+   {
+      if( _toStringValue == null )
+      {
+         _toStringValue = new StringBuffer("[.");
+         _toStringValue.append(this.majorId).append('.');
+         _toStringValue.append(this.minorId).append('.');
+         _toStringValue.append(']');
+      }
+
+      return _toStringValue.toString();
+   }
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/BUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrtree.ejb;
+
+/**
+ * Utility class for B.
+ */
+public class BUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.cmrtree.ejb.BLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for B. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.cmrtree.ejb.BLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.cmrtree.ejb.BLocalHome) initialContext.lookup(org.jboss.test.cmp2.cmrtree.ejb.BLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/Facade.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/Facade.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/Facade.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,31 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrtree.ejb;
+
+/**
+ * Remote interface for Facade.
+ */
+public interface Facade
+   extends javax.ejb.EJBObject
+{
+
+   public void setup(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void test( long sleep )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void tearDown(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setup2(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setBNameToNull(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.String getBName(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/FacadeHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/FacadeHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/FacadeHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrtree.ejb;
+
+/**
+ * Home interface for Facade.
+ */
+public interface FacadeHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/Facade";
+   public static final String JNDI_NAME="Facade";
+
+   public org.jboss.test.cmp2.cmrtree.ejb.Facade create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/FacadeUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/FacadeUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/cmrtree/ejb/FacadeUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,52 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.cmrtree.ejb;
+
+/**
+ * Utility class for Facade.
+ */
+public class FacadeUtil
+{
+   /** Cached remote home (EJBHome). Uses lazy loading to obtain its value (loaded by getHome() methods). */
+   private static org.jboss.test.cmp2.cmrtree.ejb.FacadeHome cachedRemoteHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain remote home interface from default initial context
+    * @return Home interface for Facade. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.cmrtree.ejb.FacadeHome getHome() throws javax.naming.NamingException
+   {
+      if (cachedRemoteHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            java.lang.Object objRef = initialContext.lookup(org.jboss.test.cmp2.cmrtree.ejb.FacadeHome.JNDI_NAME);
+            cachedRemoteHome = (org.jboss.test.cmp2.cmrtree.ejb.FacadeHome) javax.rmi.PortableRemoteObject.narrow(objRef, org.jboss.test.cmp2.cmrtree.ejb.FacadeHome.class);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedRemoteHome;
+   }
+
+   /**
+    * Obtain remote home interface from parameterised initial context
+    * @param environment Parameters to use for creating initial context
+    * @return Home interface for Facade. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.cmrtree.ejb.FacadeHome getHome( java.util.Hashtable environment ) throws javax.naming.NamingException
+   {
+      // Obtain initial context
+      javax.naming.InitialContext initialContext = new javax.naming.InitialContext(environment);
+      try {
+         java.lang.Object objRef = initialContext.lookup(org.jboss.test.cmp2.cmrtree.ejb.FacadeHome.JNDI_NAME);
+         return (org.jboss.test.cmp2.cmrtree.ejb.FacadeHome) javax.rmi.PortableRemoteObject.narrow(objRef, org.jboss.test.cmp2.cmrtree.ejb.FacadeHome.class);
+      } finally {
+         initialContext.close();
+      }
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ACMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ACMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ACMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,59 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.ejbselect;
+
+/**
+ * CMP layer for A.
+ */
+public abstract class ACMP
+   extends org.jboss.test.cmp2.ejbselect.ABean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() 
+   {
+      super.ejbLoad();
+   }
+
+   public void ejbStore() 
+   {
+         super.ejbStore();
+   }
+
+   public void ejbActivate() 
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() 
+   {
+      super.ejbPassivate();
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) 
+   {
+      super.setEntityContext(ctx);
+   }
+
+   public void unsetEntityContext() 
+   {
+      super.unsetEntityContext();
+   }
+
+   public void ejbRemove() throws javax.ejb.RemoveException
+   {
+      super.ejbRemove();
+
+   }
+
+   public abstract java.lang.String getId() ;
+
+   public abstract void setId( java.lang.String id ) ;
+
+   public abstract int getIntField() ;
+
+   public abstract void setIntField( int intField ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ALocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ALocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ALocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,29 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.ejbselect;
+
+/**
+ * Local interface for A.
+ */
+public interface ALocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.String getId(  ) ;
+
+   public int getIntField(  ) ;
+
+   public void setIntField( int value ) ;
+
+   public java.util.Collection getBs(  ) ;
+
+   public void setBs( java.util.Collection Bs ) ;
+
+   public java.util.Collection getSomeBs(  ) throws javax.ejb.FinderException;
+
+   public java.util.Collection getSomeBsDeclaredSQL(  ) throws javax.ejb.FinderException;
+
+   public java.util.Collection getAWithBs(  ) throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ALocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ALocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ALocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,27 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.ejbselect;
+
+/**
+ * Local home interface for A.
+ */
+public interface ALocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ALocal";
+   public static final String JNDI_NAME="ALocal";
+
+   public org.jboss.test.cmp2.ejbselect.ALocal create(java.lang.String id)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.ejbselect.ALocal findByPrimaryKey(java.lang.String pk)
+      throws javax.ejb.FinderException;
+
+   public java.util.Collection getSomeBs(org.jboss.test.cmp2.ejbselect.ALocal a) throws javax.ejb.FinderException;
+
+   public java.util.Collection getSomeBsDeclaredSQL(org.jboss.test.cmp2.ejbselect.ALocal a) throws javax.ejb.FinderException;
+
+   public void checkFinderForNull() throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/AUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/AUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/AUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.ejbselect;
+
+/**
+ * Utility class for A.
+ */
+public class AUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.ejbselect.ALocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for A. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.ejbselect.ALocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.ejbselect.ALocalHome) initialContext.lookup(org.jboss.test.cmp2.ejbselect.ALocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,67 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.ejbselect;
+
+/**
+ * CMP layer for B.
+ */
+public abstract class BCMP
+   extends org.jboss.test.cmp2.ejbselect.BBean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() 
+   {
+      super.ejbLoad();
+   }
+
+   public void ejbStore() 
+   {
+         super.ejbStore();
+   }
+
+   public void ejbActivate() 
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() 
+   {
+      super.ejbPassivate();
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) 
+   {
+      super.setEntityContext(ctx);
+   }
+
+   public void unsetEntityContext() 
+   {
+      super.unsetEntityContext();
+   }
+
+   public void ejbRemove() throws javax.ejb.RemoveException
+   {
+      super.ejbRemove();
+
+   }
+
+   public abstract java.lang.String getId() ;
+
+   public abstract void setId( java.lang.String id ) ;
+
+   public abstract java.lang.String getName() ;
+
+   public abstract void setName( java.lang.String name ) ;
+
+   public abstract boolean getBool() ;
+
+   public abstract void setBool( boolean bool ) ;
+
+   public abstract long getLongField() ;
+
+   public abstract void setLongField( long longField ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,35 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.ejbselect;
+
+/**
+ * Local interface for B.
+ */
+public interface BLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.String getId(  ) ;
+
+   public java.lang.String getName(  ) ;
+
+   public void setName( java.lang.String name ) ;
+
+   public boolean getBool(  ) ;
+
+   public void setBool( boolean bool ) ;
+
+   public long getLongField(  ) ;
+
+   public void setLongField( long value ) ;
+
+   public org.jboss.test.cmp2.ejbselect.ALocal getA(  ) ;
+
+   public void setA( org.jboss.test.cmp2.ejbselect.ALocal a ) ;
+
+   public java.util.Collection getTrue(  ) throws javax.ejb.FinderException;
+
+   public java.util.Collection getFalse(  ) throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,23 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.ejbselect;
+
+/**
+ * Local home interface for B.
+ */
+public interface BLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/BLocal";
+   public static final String JNDI_NAME="BLocal";
+
+   public org.jboss.test.cmp2.ejbselect.BLocal create(java.lang.String id , java.lang.String name , boolean bool)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.ejbselect.BLocal findByPrimaryKey(java.lang.String pk)
+      throws javax.ejb.FinderException;
+
+   public java.util.Collection selectDynamic(java.lang.String ql,java.lang.Object[] params) throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/ejbselect/BUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.ejbselect;
+
+/**
+ * Utility class for B.
+ */
+public class BUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.ejbselect.BLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for B. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.ejbselect.BLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.ejbselect.BLocalHome) initialContext.lookup(org.jboss.test.cmp2.ejbselect.BLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/ChildLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/ChildLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/ChildLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,23 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.enums.ejb;
+
+/**
+ * Local interface for Child.
+ */
+public interface ChildLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public org.jboss.test.cmp2.enums.ejb.IDClass getId(  ) ;
+
+   public org.jboss.test.cmp2.enums.ejb.ColorEnum getColor(  ) ;
+
+   public void setColor( org.jboss.test.cmp2.enums.ejb.ColorEnum color ) ;
+
+   public org.jboss.test.cmp2.enums.ejb.AnimalEnum getAnimal(  ) ;
+
+   public void setAnimal( org.jboss.test.cmp2.enums.ejb.AnimalEnum animal ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/ChildLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/ChildLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/ChildLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,33 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.enums.ejb;
+
+/**
+ * Local home interface for Child.
+ */
+public interface ChildLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ChildLocal";
+   public static final String JNDI_NAME="ChildLocal";
+
+   public org.jboss.test.cmp2.enums.ejb.ChildLocal create(org.jboss.test.cmp2.enums.ejb.IDClass childId)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.enums.ejb.ChildLocal findByColor(org.jboss.test.cmp2.enums.ejb.ColorEnum color)
+      throws javax.ejb.FinderException;
+
+   public org.jboss.test.cmp2.enums.ejb.ChildLocal findByColorDeclaredSql(org.jboss.test.cmp2.enums.ejb.ColorEnum color)
+      throws javax.ejb.FinderException;
+
+   public java.util.Collection findLowColor(org.jboss.test.cmp2.enums.ejb.ColorEnum color)
+      throws javax.ejb.FinderException;
+
+   public org.jboss.test.cmp2.enums.ejb.ChildLocal findAndOrderByColor(org.jboss.test.cmp2.enums.ejb.ColorEnum color)
+      throws javax.ejb.FinderException;
+
+   public org.jboss.test.cmp2.enums.ejb.ChildLocal findByPrimaryKey(org.jboss.test.cmp2.enums.ejb.IDClass pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/ChildUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/ChildUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/ChildUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.enums.ejb;
+
+/**
+ * Utility class for Child.
+ */
+public class ChildUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.enums.ejb.ChildLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for Child. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.enums.ejb.ChildLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.enums.ejb.ChildLocalHome) initialContext.lookup(org.jboss.test.cmp2.enums.ejb.ChildLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/Facade.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/Facade.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/Facade.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,43 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.enums.ejb;
+
+/**
+ * Remote interface for Facade.
+ */
+public interface Facade
+   extends javax.ejb.EJBObject
+{
+
+   public org.jboss.test.cmp2.enums.ejb.ColorEnum getColorForId( org.jboss.test.cmp2.enums.ejb.IDClass id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public org.jboss.test.cmp2.enums.ejb.AnimalEnum getAnimalForId( org.jboss.test.cmp2.enums.ejb.IDClass id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setColor( org.jboss.test.cmp2.enums.ejb.IDClass id,org.jboss.test.cmp2.enums.ejb.ColorEnum color )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void setAnimal( org.jboss.test.cmp2.enums.ejb.IDClass id,org.jboss.test.cmp2.enums.ejb.AnimalEnum animal )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void createChild( org.jboss.test.cmp2.enums.ejb.IDClass childId )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void removeChild( org.jboss.test.cmp2.enums.ejb.IDClass childId )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public org.jboss.test.cmp2.enums.ejb.IDClass findByColor( org.jboss.test.cmp2.enums.ejb.ColorEnum color )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public org.jboss.test.cmp2.enums.ejb.IDClass findAndOrderByColor( org.jboss.test.cmp2.enums.ejb.ColorEnum color )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public org.jboss.test.cmp2.enums.ejb.IDClass findByColorDeclaredSql( org.jboss.test.cmp2.enums.ejb.ColorEnum color )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.util.List findLowColor( org.jboss.test.cmp2.enums.ejb.ColorEnum color )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/FacadeHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/FacadeHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/FacadeHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.enums.ejb;
+
+/**
+ * Home interface for Facade.
+ */
+public interface FacadeHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/Facade";
+   public static final String JNDI_NAME="Facade";
+
+   public org.jboss.test.cmp2.enums.ejb.Facade create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/FacadeUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/FacadeUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/enums/ejb/FacadeUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,52 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.enums.ejb;
+
+/**
+ * Utility class for Facade.
+ */
+public class FacadeUtil
+{
+   /** Cached remote home (EJBHome). Uses lazy loading to obtain its value (loaded by getHome() methods). */
+   private static org.jboss.test.cmp2.enums.ejb.FacadeHome cachedRemoteHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain remote home interface from default initial context
+    * @return Home interface for Facade. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.enums.ejb.FacadeHome getHome() throws javax.naming.NamingException
+   {
+      if (cachedRemoteHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            java.lang.Object objRef = initialContext.lookup(org.jboss.test.cmp2.enums.ejb.FacadeHome.JNDI_NAME);
+            cachedRemoteHome = (org.jboss.test.cmp2.enums.ejb.FacadeHome) javax.rmi.PortableRemoteObject.narrow(objRef, org.jboss.test.cmp2.enums.ejb.FacadeHome.class);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedRemoteHome;
+   }
+
+   /**
+    * Obtain remote home interface from parameterised initial context
+    * @param environment Parameters to use for creating initial context
+    * @return Home interface for Facade. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.enums.ejb.FacadeHome getHome( java.util.Hashtable environment ) throws javax.naming.NamingException
+   {
+      // Obtain initial context
+      javax.naming.InitialContext initialContext = new javax.naming.InitialContext(environment);
+      try {
+         java.lang.Object objRef = initialContext.lookup(org.jboss.test.cmp2.enums.ejb.FacadeHome.JNDI_NAME);
+         return (org.jboss.test.cmp2.enums.ejb.FacadeHome) javax.rmi.PortableRemoteObject.narrow(objRef, org.jboss.test.cmp2.enums.ejb.FacadeHome.class);
+      } finally {
+         initialContext.close();
+      }
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,67 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * CMP layer for Child.
+ */
+public abstract class ChildCMP
+   extends org.jboss.test.cmp2.fkmapping.ejb.ChildCMPBean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() 
+   {
+      super.ejbLoad();
+   }
+
+   public void ejbStore() 
+   {
+         super.ejbStore();
+   }
+
+   public void ejbActivate() 
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() 
+   {
+      super.ejbPassivate();
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) 
+   {
+      super.setEntityContext(ctx);
+   }
+
+   public void unsetEntityContext() 
+   {
+      super.unsetEntityContext();
+   }
+
+   public void ejbRemove() throws javax.ejb.RemoveException
+   {
+      super.ejbRemove();
+
+   }
+
+   public abstract java.lang.Long getId() ;
+
+   public abstract void setId( java.lang.Long id ) ;
+
+   public abstract java.lang.String getFirstName() ;
+
+   public abstract void setFirstName( java.lang.String firstName ) ;
+
+   public abstract java.lang.Long getMotherId() ;
+
+   public abstract void setMotherId( java.lang.Long motherId ) ;
+
+   public abstract java.lang.String getMotherName() ;
+
+   public abstract void setMotherName( java.lang.String motherName ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,31 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local interface for Child.
+ */
+public interface ChildLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.Long getId(  ) ;
+
+   public java.lang.String getFirstName(  ) ;
+
+   /**
+    * Non-null CMP field mapped to the foreign key field Used as a read-only field to verify correctness of INSERT
+    */
+   public java.lang.Long getMotherId(  ) ;
+
+   /**
+    * Non-null CMP field mapped to the foreign key field Used as a read-only field to verify correctness of INSERT
+    */
+   public java.lang.String getMotherName(  ) ;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.ParentLocal getMother(  ) ;
+
+   public void setMother( org.jboss.test.cmp2.fkmapping.ejb.ParentLocal parent ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,24 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local home interface for Child.
+ */
+public interface ChildLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ChildLocal";
+   public static final String JNDI_NAME="ChildLocal";
+
+   public org.jboss.test.cmp2.fkmapping.ejb.ChildLocal create(java.lang.Long childId , java.lang.String firstName)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.ChildLocal create(java.lang.Long childId , java.lang.String firstName , java.lang.Long parentId , java.lang.String parentName)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.ChildLocal findByPrimaryKey(java.lang.Long pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,64 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * CMP layer for ChildUPK.
+ */
+public abstract class ChildUPKCMP
+   extends org.jboss.test.cmp2.fkmapping.ejb.ChildCMPUnknownPKBean
+   implements javax.ejb.EntityBean
+{
+
+   /**
+    * Generated ejbPostCreate for corresponding ejbCreate method.
+    *
+    * @see #ejbCreate(java.lang.String firstName)
+    */
+   public void ejbPostCreate(java.lang.String firstName)
+   {
+   }
+
+   public void ejbLoad() 
+   {
+      super.ejbLoad();
+   }
+
+   public void ejbStore() 
+   {
+         super.ejbStore();
+   }
+
+   public void ejbActivate() 
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() 
+   {
+      super.ejbPassivate();
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) 
+   {
+      super.setEntityContext(ctx);
+   }
+
+   public void unsetEntityContext() 
+   {
+      super.unsetEntityContext();
+   }
+
+   public void ejbRemove() throws javax.ejb.RemoveException
+   {
+      super.ejbRemove();
+
+   }
+
+   public abstract java.lang.String getFirstName() ;
+
+   public abstract void setFirstName( java.lang.String firstName ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,23 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local interface for ChildUPK.
+ */
+public interface ChildUPKLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.String getFirstName(  ) ;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.ParentLocal getFather(  ) ;
+
+   public void setFather( org.jboss.test.cmp2.fkmapping.ejb.ParentLocal parent ) ;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.ParentLocal getMother(  ) ;
+
+   public void setMother( org.jboss.test.cmp2.fkmapping.ejb.ParentLocal parent ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local home interface for ChildUPK.
+ */
+public interface ChildUPKLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ChildUPKLocal";
+   public static final String JNDI_NAME="ChildUPKLocal";
+
+   public org.jboss.test.cmp2.fkmapping.ejb.ChildUPKLocal create(java.lang.String firstName)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.ChildUPKLocal findByPrimaryKey(java.lang.Object pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUPKUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Utility class for ChildUPK.
+ */
+public class ChildUPKUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.fkmapping.ejb.ChildUPKLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for ChildUPK. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkmapping.ejb.ChildUPKLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.fkmapping.ejb.ChildUPKLocalHome) initialContext.lookup(org.jboss.test.cmp2.fkmapping.ejb.ChildUPKLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ChildUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Utility class for Child.
+ */
+public class ChildUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.fkmapping.ejb.ChildLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for Child. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkmapping.ejb.ChildLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.fkmapping.ejb.ChildLocalHome) initialContext.lookup(org.jboss.test.cmp2.fkmapping.ejb.ChildLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,63 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * CMP layer for Department.
+ */
+public abstract class DepartmentCMP
+   extends org.jboss.test.cmp2.fkmapping.ejb.DepartmentEntityBean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbLoad();
+   }
+
+   public void ejbStore() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+         super.ejbStore();
+   }
+
+   public void ejbActivate() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbPassivate();
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.setEntityContext(ctx);
+   }
+
+   public void unsetEntityContext() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.unsetEntityContext();
+   }
+
+   public void ejbRemove() throws javax.ejb.EJBException, java.rmi.RemoteException, javax.ejb.RemoveException
+   {
+      super.ejbRemove();
+
+   }
+
+   public abstract java.lang.String getDepartmentCode() ;
+
+   public abstract void setDepartmentCode( java.lang.String departmentCode ) ;
+
+   public abstract java.lang.String getDepartmentCode2() ;
+
+   public abstract void setDepartmentCode2( java.lang.String departmentCode2 ) ;
+
+   public abstract java.lang.String getDescription() ;
+
+   public abstract void setDescription( java.lang.String description ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,31 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local interface for Department.
+ */
+public interface DepartmentLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.String getDepartmentCode(  ) ;
+
+   public java.lang.String getDepartmentCode2(  ) ;
+
+   public java.lang.String getDescription(  ) ;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.InstituteLocal getInstitute(  ) ;
+
+   public void setInstitute( org.jboss.test.cmp2.fkmapping.ejb.InstituteLocal institute ) ;
+
+   public java.util.Collection getGroups(  ) ;
+
+   public void setGroups( java.util.Collection groups ) ;
+
+   public java.util.Collection getStudents(  ) ;
+
+   public void setStudents( java.util.Collection students ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local home interface for Department.
+ */
+public interface DepartmentLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/DepartmentLocal";
+   public static final String JNDI_NAME="Department";
+
+   public org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocal create(java.lang.String deptCode , java.lang.String descr)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocal findByPrimaryKey(org.jboss.test.cmp2.fkmapping.ejb.DepartmentPK pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentPK.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentPK.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentPK.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,123 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Primary key for Department.
+ */
+public class DepartmentPK
+   extends java.lang.Object
+   implements java.io.Serializable
+{
+   private int _hashCode = 0;
+   private StringBuffer _toStringValue = null;
+
+   public java.lang.String departmentCode;
+   public java.lang.String departmentCode2;
+
+   public DepartmentPK()
+   {
+   }
+
+   public DepartmentPK( java.lang.String departmentCode,java.lang.String departmentCode2 )
+   {
+      this.departmentCode = departmentCode;
+      this.departmentCode2 = departmentCode2;
+   }
+
+   public java.lang.String getDepartmentCode()
+   {
+      return departmentCode;
+   }
+   public java.lang.String getDepartmentCode2()
+   {
+      return departmentCode2;
+   }
+
+   public void setDepartmentCode(java.lang.String departmentCode)
+   {
+      this.departmentCode = departmentCode;
+      _hashCode = 0;
+   }
+   public void setDepartmentCode2(java.lang.String departmentCode2)
+   {
+      this.departmentCode2 = departmentCode2;
+      _hashCode = 0;
+   }
+
+   public int hashCode()
+   {
+      if( _hashCode == 0 )
+      {
+         if (this.departmentCode != null) _hashCode += this.departmentCode.hashCode();
+         if (this.departmentCode2 != null) _hashCode += this.departmentCode2.hashCode();
+      }
+
+      return _hashCode;
+   }
+
+   public boolean equals(Object obj)
+   {
+      if( !(obj instanceof org.jboss.test.cmp2.fkmapping.ejb.DepartmentPK) )
+         return false;
+
+      org.jboss.test.cmp2.fkmapping.ejb.DepartmentPK pk = (org.jboss.test.cmp2.fkmapping.ejb.DepartmentPK)obj;
+      boolean eq = true;
+
+      if( obj == null )
+      {
+         eq = false;
+      }
+      else
+      {
+         if( this.departmentCode == null && ((org.jboss.test.cmp2.fkmapping.ejb.DepartmentPK)obj).getDepartmentCode() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.departmentCode == null || ((org.jboss.test.cmp2.fkmapping.ejb.DepartmentPK)obj).getDepartmentCode() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.departmentCode.equals( pk.departmentCode );
+            }
+         }
+         if( this.departmentCode2 == null && ((org.jboss.test.cmp2.fkmapping.ejb.DepartmentPK)obj).getDepartmentCode2() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.departmentCode2 == null || ((org.jboss.test.cmp2.fkmapping.ejb.DepartmentPK)obj).getDepartmentCode2() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.departmentCode2.equals( pk.departmentCode2 );
+            }
+         }
+      }
+
+      return eq;
+   }
+
+   /** @return String representation of this pk in the form of [.field1.field2.field3]. */
+   public String toString()
+   {
+      if( _toStringValue == null )
+      {
+         _toStringValue = new StringBuffer("[.");
+         _toStringValue.append(this.departmentCode).append('.');
+         _toStringValue.append(this.departmentCode2).append('.');
+         _toStringValue.append(']');
+      }
+
+      return _toStringValue.toString();
+   }
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/DepartmentUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Utility class for Department.
+ */
+public class DepartmentUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for Department. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocalHome) initialContext.lookup(org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,71 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * CMP layer for Examenation.
+ */
+public abstract class ExamenationCMP
+   extends org.jboss.test.cmp2.fkmapping.ejb.ExamenationEntityBean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbLoad();
+   }
+
+   public void ejbStore() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+         super.ejbStore();
+   }
+
+   public void ejbActivate() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbPassivate();
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.setEntityContext(ctx);
+   }
+
+   public void unsetEntityContext() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.unsetEntityContext();
+   }
+
+   public void ejbRemove() throws javax.ejb.EJBException, java.rmi.RemoteException, javax.ejb.RemoveException
+   {
+      super.ejbRemove();
+
+   }
+
+   public abstract java.lang.String getExamId() ;
+
+   public abstract void setExamId( java.lang.String examId ) ;
+
+   public abstract java.lang.String getSubject() ;
+
+   public abstract void setSubject( java.lang.String subject ) ;
+
+   public abstract java.lang.String getDepartmentCode() ;
+
+   public abstract void setDepartmentCode( java.lang.String departmentCode ) ;
+
+   public abstract java.lang.String getDepartmentCode2() ;
+
+   public abstract void setDepartmentCode2( java.lang.String departmentCode2 ) ;
+
+   public abstract long getGroupNumber() ;
+
+   public abstract void setGroupNumber( long groupNumber ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,35 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local interface for Examenation.
+ */
+public interface ExamenationLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.String getExamId(  ) ;
+
+   public java.lang.String getSubject(  ) ;
+
+   public void setSubject( java.lang.String subject ) ;
+
+   public java.lang.String getDepartmentCode(  ) ;
+
+   public void setDepartmentCode( java.lang.String deptCode ) ;
+
+   public java.lang.String getDepartmentCode2(  ) ;
+
+   public void setDepartmentCode2( java.lang.String deptCode ) ;
+
+   public long getGroupNumber(  ) ;
+
+   public void setGroupNumber( long groupNum ) ;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.GroupLocal getGroup(  ) ;
+
+   public void setGroup( org.jboss.test.cmp2.fkmapping.ejb.GroupLocal group ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local home interface for Examenation.
+ */
+public interface ExamenationLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ExamenationLocal";
+   public static final String JNDI_NAME="Examenation";
+
+   public org.jboss.test.cmp2.fkmapping.ejb.ExamenationLocal create(java.lang.String examId , java.lang.String subject , java.lang.String deptCode , long groupNum)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.ExamenationLocal findByPrimaryKey(org.jboss.test.cmp2.fkmapping.ejb.ExamenationPK pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationPK.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationPK.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationPK.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,95 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Primary key for Examenation.
+ */
+public class ExamenationPK
+   extends java.lang.Object
+   implements java.io.Serializable
+{
+   private int _hashCode = 0;
+   private StringBuffer _toStringValue = null;
+
+   public java.lang.String examId;
+
+   public ExamenationPK()
+   {
+   }
+
+   public ExamenationPK( java.lang.String examId )
+   {
+      this.examId = examId;
+   }
+
+   public java.lang.String getExamId()
+   {
+      return examId;
+   }
+
+   public void setExamId(java.lang.String examId)
+   {
+      this.examId = examId;
+      _hashCode = 0;
+   }
+
+   public int hashCode()
+   {
+      if( _hashCode == 0 )
+      {
+         if (this.examId != null) _hashCode += this.examId.hashCode();
+      }
+
+      return _hashCode;
+   }
+
+   public boolean equals(Object obj)
+   {
+      if( !(obj instanceof org.jboss.test.cmp2.fkmapping.ejb.ExamenationPK) )
+         return false;
+
+      org.jboss.test.cmp2.fkmapping.ejb.ExamenationPK pk = (org.jboss.test.cmp2.fkmapping.ejb.ExamenationPK)obj;
+      boolean eq = true;
+
+      if( obj == null )
+      {
+         eq = false;
+      }
+      else
+      {
+         if( this.examId == null && ((org.jboss.test.cmp2.fkmapping.ejb.ExamenationPK)obj).getExamId() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.examId == null || ((org.jboss.test.cmp2.fkmapping.ejb.ExamenationPK)obj).getExamId() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.examId.equals( pk.examId );
+            }
+         }
+      }
+
+      return eq;
+   }
+
+   /** @return String representation of this pk in the form of [.field1.field2.field3]. */
+   public String toString()
+   {
+      if( _toStringValue == null )
+      {
+         _toStringValue = new StringBuffer("[.");
+         _toStringValue.append(this.examId).append('.');
+         _toStringValue.append(']');
+      }
+
+      return _toStringValue.toString();
+   }
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ExamenationUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Utility class for Examenation.
+ */
+public class ExamenationUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.fkmapping.ejb.ExamenationLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for Examenation. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkmapping.ejb.ExamenationLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.fkmapping.ejb.ExamenationLocalHome) initialContext.lookup(org.jboss.test.cmp2.fkmapping.ejb.ExamenationLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,67 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * CMP layer for Group.
+ */
+public abstract class GroupCMP
+   extends org.jboss.test.cmp2.fkmapping.ejb.GroupEntityBean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbLoad();
+   }
+
+   public void ejbStore() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+         super.ejbStore();
+   }
+
+   public void ejbActivate() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbPassivate();
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.setEntityContext(ctx);
+   }
+
+   public void unsetEntityContext() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.unsetEntityContext();
+   }
+
+   public void ejbRemove() throws javax.ejb.EJBException, java.rmi.RemoteException, javax.ejb.RemoveException
+   {
+      super.ejbRemove();
+
+   }
+
+   public abstract java.lang.String getDepartmentCode() ;
+
+   public abstract void setDepartmentCode( java.lang.String departmentCode ) ;
+
+   public abstract java.lang.String getDepartmentCode2() ;
+
+   public abstract void setDepartmentCode2( java.lang.String departmentCode2 ) ;
+
+   public abstract long getGroupNumber() ;
+
+   public abstract void setGroupNumber( long groupNumber ) ;
+
+   public abstract java.lang.String getDescription() ;
+
+   public abstract void setDescription( java.lang.String description ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,33 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local interface for Group.
+ */
+public interface GroupLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.String getDepartmentCode(  ) ;
+
+   public java.lang.String getDepartmentCode2(  ) ;
+
+   public long getGroupNumber(  ) ;
+
+   public java.lang.String getDescription(  ) ;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocal getDepartment(  ) ;
+
+   public void setDepartment( org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocal department ) ;
+
+   public java.util.Collection getStudents(  ) ;
+
+   public void setStudents( java.util.Collection students ) ;
+
+   public java.util.Collection getExamenations(  ) ;
+
+   public void setExamenations( java.util.Collection students ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,24 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local home interface for Group.
+ */
+public interface GroupLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/GroupLocal";
+   public static final String JNDI_NAME="Group";
+
+   public org.jboss.test.cmp2.fkmapping.ejb.GroupLocal create(java.lang.String deptCode , long groupNum , java.lang.String descr)
+      throws javax.ejb.CreateException;
+
+   public java.util.Collection findAll()
+      throws javax.ejb.FinderException;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.GroupLocal findByPrimaryKey(org.jboss.test.cmp2.fkmapping.ejb.GroupPK pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupPK.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupPK.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupPK.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,137 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Primary key for Group.
+ */
+public class GroupPK
+   extends java.lang.Object
+   implements java.io.Serializable
+{
+   private int _hashCode = 0;
+   private StringBuffer _toStringValue = null;
+
+   public java.lang.String departmentCode;
+   public java.lang.String departmentCode2;
+   public long groupNumber;
+
+   public GroupPK()
+   {
+   }
+
+   public GroupPK( java.lang.String departmentCode,java.lang.String departmentCode2,long groupNumber )
+   {
+      this.departmentCode = departmentCode;
+      this.departmentCode2 = departmentCode2;
+      this.groupNumber = groupNumber;
+   }
+
+   public java.lang.String getDepartmentCode()
+   {
+      return departmentCode;
+   }
+   public java.lang.String getDepartmentCode2()
+   {
+      return departmentCode2;
+   }
+   public long getGroupNumber()
+   {
+      return groupNumber;
+   }
+
+   public void setDepartmentCode(java.lang.String departmentCode)
+   {
+      this.departmentCode = departmentCode;
+      _hashCode = 0;
+   }
+   public void setDepartmentCode2(java.lang.String departmentCode2)
+   {
+      this.departmentCode2 = departmentCode2;
+      _hashCode = 0;
+   }
+   public void setGroupNumber(long groupNumber)
+   {
+      this.groupNumber = groupNumber;
+      _hashCode = 0;
+   }
+
+   public int hashCode()
+   {
+      if( _hashCode == 0 )
+      {
+         if (this.departmentCode != null) _hashCode += this.departmentCode.hashCode();
+         if (this.departmentCode2 != null) _hashCode += this.departmentCode2.hashCode();
+         _hashCode += (int)this.groupNumber;
+      }
+
+      return _hashCode;
+   }
+
+   public boolean equals(Object obj)
+   {
+      if( !(obj instanceof org.jboss.test.cmp2.fkmapping.ejb.GroupPK) )
+         return false;
+
+      org.jboss.test.cmp2.fkmapping.ejb.GroupPK pk = (org.jboss.test.cmp2.fkmapping.ejb.GroupPK)obj;
+      boolean eq = true;
+
+      if( obj == null )
+      {
+         eq = false;
+      }
+      else
+      {
+         if( this.departmentCode == null && ((org.jboss.test.cmp2.fkmapping.ejb.GroupPK)obj).getDepartmentCode() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.departmentCode == null || ((org.jboss.test.cmp2.fkmapping.ejb.GroupPK)obj).getDepartmentCode() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.departmentCode.equals( pk.departmentCode );
+            }
+         }
+         if( this.departmentCode2 == null && ((org.jboss.test.cmp2.fkmapping.ejb.GroupPK)obj).getDepartmentCode2() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.departmentCode2 == null || ((org.jboss.test.cmp2.fkmapping.ejb.GroupPK)obj).getDepartmentCode2() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.departmentCode2.equals( pk.departmentCode2 );
+            }
+         }
+         eq = eq && this.groupNumber == pk.groupNumber;
+      }
+
+      return eq;
+   }
+
+   /** @return String representation of this pk in the form of [.field1.field2.field3]. */
+   public String toString()
+   {
+      if( _toStringValue == null )
+      {
+         _toStringValue = new StringBuffer("[.");
+         _toStringValue.append(this.departmentCode).append('.');
+         _toStringValue.append(this.departmentCode2).append('.');
+         _toStringValue.append(this.groupNumber).append('.');
+         _toStringValue.append(']');
+      }
+
+      return _toStringValue.toString();
+   }
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/GroupUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Utility class for Group.
+ */
+public class GroupUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.fkmapping.ejb.GroupLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for Group. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkmapping.ejb.GroupLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.fkmapping.ejb.GroupLocalHome) initialContext.lookup(org.jboss.test.cmp2.fkmapping.ejb.GroupLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,59 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * CMP layer for Institute.
+ */
+public abstract class InstituteCMP
+   extends org.jboss.test.cmp2.fkmapping.ejb.InstituteEntityBean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbLoad();
+   }
+
+   public void ejbStore() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+         super.ejbStore();
+   }
+
+   public void ejbActivate() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbPassivate();
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.setEntityContext(ctx);
+   }
+
+   public void unsetEntityContext() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.unsetEntityContext();
+   }
+
+   public void ejbRemove() throws javax.ejb.EJBException, java.rmi.RemoteException, javax.ejb.RemoveException
+   {
+      super.ejbRemove();
+
+   }
+
+   public abstract java.lang.String getInstituteId() ;
+
+   public abstract void setInstituteId( java.lang.String instituteId ) ;
+
+   public abstract java.lang.String getDescription() ;
+
+   public abstract void setDescription( java.lang.String description ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local interface for Institute.
+ */
+public interface InstituteLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.String getInstituteId(  ) ;
+
+   public java.lang.String getDescription(  ) ;
+
+   public java.util.Collection getDepartments(  ) ;
+
+   public void setDepartments( java.util.Collection departments ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local home interface for Institute.
+ */
+public interface InstituteLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/InstituteLocal";
+   public static final String JNDI_NAME="Institute";
+
+   public org.jboss.test.cmp2.fkmapping.ejb.InstituteLocal create(java.lang.String instituteId , java.lang.String descr)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.InstituteLocal findByPrimaryKey(org.jboss.test.cmp2.fkmapping.ejb.InstitutePK pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstitutePK.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstitutePK.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstitutePK.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,95 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Primary key for Institute.
+ */
+public class InstitutePK
+   extends java.lang.Object
+   implements java.io.Serializable
+{
+   private int _hashCode = 0;
+   private StringBuffer _toStringValue = null;
+
+   public java.lang.String instituteId;
+
+   public InstitutePK()
+   {
+   }
+
+   public InstitutePK( java.lang.String instituteId )
+   {
+      this.instituteId = instituteId;
+   }
+
+   public java.lang.String getInstituteId()
+   {
+      return instituteId;
+   }
+
+   public void setInstituteId(java.lang.String instituteId)
+   {
+      this.instituteId = instituteId;
+      _hashCode = 0;
+   }
+
+   public int hashCode()
+   {
+      if( _hashCode == 0 )
+      {
+         if (this.instituteId != null) _hashCode += this.instituteId.hashCode();
+      }
+
+      return _hashCode;
+   }
+
+   public boolean equals(Object obj)
+   {
+      if( !(obj instanceof org.jboss.test.cmp2.fkmapping.ejb.InstitutePK) )
+         return false;
+
+      org.jboss.test.cmp2.fkmapping.ejb.InstitutePK pk = (org.jboss.test.cmp2.fkmapping.ejb.InstitutePK)obj;
+      boolean eq = true;
+
+      if( obj == null )
+      {
+         eq = false;
+      }
+      else
+      {
+         if( this.instituteId == null && ((org.jboss.test.cmp2.fkmapping.ejb.InstitutePK)obj).getInstituteId() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.instituteId == null || ((org.jboss.test.cmp2.fkmapping.ejb.InstitutePK)obj).getInstituteId() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.instituteId.equals( pk.instituteId );
+            }
+         }
+      }
+
+      return eq;
+   }
+
+   /** @return String representation of this pk in the form of [.field1.field2.field3]. */
+   public String toString()
+   {
+      if( _toStringValue == null )
+      {
+         _toStringValue = new StringBuffer("[.");
+         _toStringValue.append(this.instituteId).append('.');
+         _toStringValue.append(']');
+      }
+
+      return _toStringValue.toString();
+   }
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/InstituteUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Utility class for Institute.
+ */
+public class InstituteUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.fkmapping.ejb.InstituteLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for Institute. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkmapping.ejb.InstituteLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.fkmapping.ejb.InstituteLocalHome) initialContext.lookup(org.jboss.test.cmp2.fkmapping.ejb.InstituteLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/Manager.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/Manager.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/Manager.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,49 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Remote interface for Manager.
+ */
+public interface Manager
+   extends javax.ejb.EJBObject
+{
+
+   public void testStandaloneFKMapping(  )
+      throws java.rmi.RemoteException;
+
+   public void testCompleteFKToPKMapping(  )
+      throws java.rmi.RemoteException;
+
+   public void testPartialFKToPKMapping(  )
+      throws java.rmi.RemoteException;
+
+   public void testFKToCMPMapping(  )
+      throws java.rmi.RemoteException;
+
+   public void createParent( java.lang.Long id,java.lang.String firstName )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void createChild( java.lang.Long id,java.lang.String firstName )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void createChild( java.lang.Long id,java.lang.String firstName,java.lang.Long parentId,java.lang.String parentName )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void assertChildHasMother( java.lang.Long childId,java.lang.Long parentId,java.lang.String parentName )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.Object createChildUPKWithMother(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void loadChildUPKWithMother( java.lang.Object pk )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public java.lang.Object createChildUPKWithFather(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void loadChildUPKWithFather( java.lang.Object pk )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Home interface for Manager.
+ */
+public interface ManagerHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/Manager";
+   public static final String JNDI_NAME="Manager";
+
+   public org.jboss.test.cmp2.fkmapping.ejb.Manager create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerSession.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerSession.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerSession.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,37 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Session layer for Manager.
+ */
+public class ManagerSession
+   extends org.jboss.test.cmp2.fkmapping.ejb.ManagerSessionBean
+   implements javax.ejb.SessionBean
+{
+   public void ejbActivate() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbPassivate();
+   }
+
+   public void setSessionContext(javax.ejb.SessionContext ctx) throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.setSessionContext(ctx);
+   }
+
+   public void unsetSessionContext() 
+   {
+   }
+
+   public void ejbRemove() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbRemove();
+   }
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ManagerUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,52 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Utility class for Manager.
+ */
+public class ManagerUtil
+{
+   /** Cached remote home (EJBHome). Uses lazy loading to obtain its value (loaded by getHome() methods). */
+   private static org.jboss.test.cmp2.fkmapping.ejb.ManagerHome cachedRemoteHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain remote home interface from default initial context
+    * @return Home interface for Manager. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkmapping.ejb.ManagerHome getHome() throws javax.naming.NamingException
+   {
+      if (cachedRemoteHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            java.lang.Object objRef = initialContext.lookup(org.jboss.test.cmp2.fkmapping.ejb.ManagerHome.JNDI_NAME);
+            cachedRemoteHome = (org.jboss.test.cmp2.fkmapping.ejb.ManagerHome) javax.rmi.PortableRemoteObject.narrow(objRef, org.jboss.test.cmp2.fkmapping.ejb.ManagerHome.class);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedRemoteHome;
+   }
+
+   /**
+    * Obtain remote home interface from parameterised initial context
+    * @param environment Parameters to use for creating initial context
+    * @return Home interface for Manager. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkmapping.ejb.ManagerHome getHome( java.util.Hashtable environment ) throws javax.naming.NamingException
+   {
+      // Obtain initial context
+      javax.naming.InitialContext initialContext = new javax.naming.InitialContext(environment);
+      try {
+         java.lang.Object objRef = initialContext.lookup(org.jboss.test.cmp2.fkmapping.ejb.ManagerHome.JNDI_NAME);
+         return (org.jboss.test.cmp2.fkmapping.ejb.ManagerHome) javax.rmi.PortableRemoteObject.narrow(objRef, org.jboss.test.cmp2.fkmapping.ejb.ManagerHome.class);
+      } finally {
+         initialContext.close();
+      }
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,59 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * CMP layer for Parent.
+ */
+public abstract class ParentCMP
+   extends org.jboss.test.cmp2.fkmapping.ejb.ParentCMPBean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() 
+   {
+      super.ejbLoad();
+   }
+
+   public void ejbStore() 
+   {
+         super.ejbStore();
+   }
+
+   public void ejbActivate() 
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() 
+   {
+      super.ejbPassivate();
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) 
+   {
+      super.setEntityContext(ctx);
+   }
+
+   public void unsetEntityContext() 
+   {
+      super.unsetEntityContext();
+   }
+
+   public void ejbRemove() throws javax.ejb.RemoveException
+   {
+      super.ejbRemove();
+
+   }
+
+   public abstract java.lang.Long getId() ;
+
+   public abstract void setId( java.lang.Long id ) ;
+
+   public abstract java.lang.String getFirstName() ;
+
+   public abstract void setFirstName( java.lang.String firstName ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,17 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local interface for Parent.
+ */
+public interface ParentLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.Long getId(  ) ;
+
+   public java.lang.String getFirstName(  ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local home interface for Parent.
+ */
+public interface ParentLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ParentLocal";
+   public static final String JNDI_NAME="ParentLocal";
+
+   public org.jboss.test.cmp2.fkmapping.ejb.ParentLocal create(java.lang.Long parentId , java.lang.String firstName)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.ParentLocal findByPrimaryKey(org.jboss.test.cmp2.fkmapping.ejb.ParentPK pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentPK.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentPK.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentPK.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,123 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Primary key for Parent.
+ */
+public class ParentPK
+   extends java.lang.Object
+   implements java.io.Serializable
+{
+   private int _hashCode = 0;
+   private StringBuffer _toStringValue = null;
+
+   public java.lang.Long id;
+   public java.lang.String firstName;
+
+   public ParentPK()
+   {
+   }
+
+   public ParentPK( java.lang.Long id,java.lang.String firstName )
+   {
+      this.id = id;
+      this.firstName = firstName;
+   }
+
+   public java.lang.Long getId()
+   {
+      return id;
+   }
+   public java.lang.String getFirstName()
+   {
+      return firstName;
+   }
+
+   public void setId(java.lang.Long id)
+   {
+      this.id = id;
+      _hashCode = 0;
+   }
+   public void setFirstName(java.lang.String firstName)
+   {
+      this.firstName = firstName;
+      _hashCode = 0;
+   }
+
+   public int hashCode()
+   {
+      if( _hashCode == 0 )
+      {
+         if (this.id != null) _hashCode += this.id.hashCode();
+         if (this.firstName != null) _hashCode += this.firstName.hashCode();
+      }
+
+      return _hashCode;
+   }
+
+   public boolean equals(Object obj)
+   {
+      if( !(obj instanceof org.jboss.test.cmp2.fkmapping.ejb.ParentPK) )
+         return false;
+
+      org.jboss.test.cmp2.fkmapping.ejb.ParentPK pk = (org.jboss.test.cmp2.fkmapping.ejb.ParentPK)obj;
+      boolean eq = true;
+
+      if( obj == null )
+      {
+         eq = false;
+      }
+      else
+      {
+         if( this.id == null && ((org.jboss.test.cmp2.fkmapping.ejb.ParentPK)obj).getId() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.id == null || ((org.jboss.test.cmp2.fkmapping.ejb.ParentPK)obj).getId() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.id.equals( pk.id );
+            }
+         }
+         if( this.firstName == null && ((org.jboss.test.cmp2.fkmapping.ejb.ParentPK)obj).getFirstName() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.firstName == null || ((org.jboss.test.cmp2.fkmapping.ejb.ParentPK)obj).getFirstName() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.firstName.equals( pk.firstName );
+            }
+         }
+      }
+
+      return eq;
+   }
+
+   /** @return String representation of this pk in the form of [.field1.field2.field3]. */
+   public String toString()
+   {
+      if( _toStringValue == null )
+      {
+         _toStringValue = new StringBuffer("[.");
+         _toStringValue.append(this.id).append('.');
+         _toStringValue.append(this.firstName).append('.');
+         _toStringValue.append(']');
+      }
+
+      return _toStringValue.toString();
+   }
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/ParentUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Utility class for Parent.
+ */
+public class ParentUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.fkmapping.ejb.ParentLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for Parent. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkmapping.ejb.ParentLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.fkmapping.ejb.ParentLocalHome) initialContext.lookup(org.jboss.test.cmp2.fkmapping.ejb.ParentLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,67 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * CMP layer for Student.
+ */
+public abstract class StudentCMP
+   extends org.jboss.test.cmp2.fkmapping.ejb.StudentEntityBean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbLoad();
+   }
+
+   public void ejbStore() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+         super.ejbStore();
+   }
+
+   public void ejbActivate() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.ejbPassivate();
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.setEntityContext(ctx);
+   }
+
+   public void unsetEntityContext() throws javax.ejb.EJBException, java.rmi.RemoteException
+   {
+      super.unsetEntityContext();
+   }
+
+   public void ejbRemove() throws javax.ejb.EJBException, java.rmi.RemoteException, javax.ejb.RemoveException
+   {
+      super.ejbRemove();
+
+   }
+
+   public abstract java.lang.String getDepartmentCode() ;
+
+   public abstract void setDepartmentCode( java.lang.String departmentCode ) ;
+
+   public abstract java.lang.String getDepartmentCode2() ;
+
+   public abstract void setDepartmentCode2( java.lang.String departmentCode2 ) ;
+
+   public abstract java.lang.String getLastName() ;
+
+   public abstract void setLastName( java.lang.String lastName ) ;
+
+   public abstract java.lang.String getDescription() ;
+
+   public abstract void setDescription( java.lang.String description ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,29 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local interface for Student.
+ */
+public interface StudentLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.String getDepartmentCode(  ) ;
+
+   public java.lang.String getDepartmentCode2(  ) ;
+
+   public java.lang.String getLastName(  ) ;
+
+   public java.lang.String getDescription(  ) ;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocal getDepartment(  ) ;
+
+   public void setDepartment( org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocal department ) ;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.GroupLocal getGroup(  ) ;
+
+   public void setGroup( org.jboss.test.cmp2.fkmapping.ejb.GroupLocal group ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Local home interface for Student.
+ */
+public interface StudentLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/StudentLocal";
+   public static final String JNDI_NAME="Student";
+
+   public org.jboss.test.cmp2.fkmapping.ejb.StudentLocal create(java.lang.String deptCode , java.lang.String lastName , java.lang.String descr)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.fkmapping.ejb.StudentLocal findByPrimaryKey(org.jboss.test.cmp2.fkmapping.ejb.StudentPK pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentPK.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentPK.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentPK.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,151 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Primary key for Student.
+ */
+public class StudentPK
+   extends java.lang.Object
+   implements java.io.Serializable
+{
+   private int _hashCode = 0;
+   private StringBuffer _toStringValue = null;
+
+   public java.lang.String departmentCode;
+   public java.lang.String departmentCode2;
+   public java.lang.String lastName;
+
+   public StudentPK()
+   {
+   }
+
+   public StudentPK( java.lang.String departmentCode,java.lang.String departmentCode2,java.lang.String lastName )
+   {
+      this.departmentCode = departmentCode;
+      this.departmentCode2 = departmentCode2;
+      this.lastName = lastName;
+   }
+
+   public java.lang.String getDepartmentCode()
+   {
+      return departmentCode;
+   }
+   public java.lang.String getDepartmentCode2()
+   {
+      return departmentCode2;
+   }
+   public java.lang.String getLastName()
+   {
+      return lastName;
+   }
+
+   public void setDepartmentCode(java.lang.String departmentCode)
+   {
+      this.departmentCode = departmentCode;
+      _hashCode = 0;
+   }
+   public void setDepartmentCode2(java.lang.String departmentCode2)
+   {
+      this.departmentCode2 = departmentCode2;
+      _hashCode = 0;
+   }
+   public void setLastName(java.lang.String lastName)
+   {
+      this.lastName = lastName;
+      _hashCode = 0;
+   }
+
+   public int hashCode()
+   {
+      if( _hashCode == 0 )
+      {
+         if (this.departmentCode != null) _hashCode += this.departmentCode.hashCode();
+         if (this.departmentCode2 != null) _hashCode += this.departmentCode2.hashCode();
+         if (this.lastName != null) _hashCode += this.lastName.hashCode();
+      }
+
+      return _hashCode;
+   }
+
+   public boolean equals(Object obj)
+   {
+      if( !(obj instanceof org.jboss.test.cmp2.fkmapping.ejb.StudentPK) )
+         return false;
+
+      org.jboss.test.cmp2.fkmapping.ejb.StudentPK pk = (org.jboss.test.cmp2.fkmapping.ejb.StudentPK)obj;
+      boolean eq = true;
+
+      if( obj == null )
+      {
+         eq = false;
+      }
+      else
+      {
+         if( this.departmentCode == null && ((org.jboss.test.cmp2.fkmapping.ejb.StudentPK)obj).getDepartmentCode() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.departmentCode == null || ((org.jboss.test.cmp2.fkmapping.ejb.StudentPK)obj).getDepartmentCode() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.departmentCode.equals( pk.departmentCode );
+            }
+         }
+         if( this.departmentCode2 == null && ((org.jboss.test.cmp2.fkmapping.ejb.StudentPK)obj).getDepartmentCode2() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.departmentCode2 == null || ((org.jboss.test.cmp2.fkmapping.ejb.StudentPK)obj).getDepartmentCode2() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.departmentCode2.equals( pk.departmentCode2 );
+            }
+         }
+         if( this.lastName == null && ((org.jboss.test.cmp2.fkmapping.ejb.StudentPK)obj).getLastName() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.lastName == null || ((org.jboss.test.cmp2.fkmapping.ejb.StudentPK)obj).getLastName() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.lastName.equals( pk.lastName );
+            }
+         }
+      }
+
+      return eq;
+   }
+
+   /** @return String representation of this pk in the form of [.field1.field2.field3]. */
+   public String toString()
+   {
+      if( _toStringValue == null )
+      {
+         _toStringValue = new StringBuffer("[.");
+         _toStringValue.append(this.departmentCode).append('.');
+         _toStringValue.append(this.departmentCode2).append('.');
+         _toStringValue.append(this.lastName).append('.');
+         _toStringValue.append(']');
+      }
+
+      return _toStringValue.toString();
+   }
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkmapping/ejb/StudentUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.fkmapping.ejb;
+
+/**
+ * Utility class for Student.
+ */
+public class StudentUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.fkmapping.ejb.StudentLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for Student. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkmapping.ejb.StudentLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.fkmapping.ejb.StudentLocalHome) initialContext.lookup(org.jboss.test.cmp2.fkmapping.ejb.StudentLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,71 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * CMP layer for Child.
+ */
+public abstract class ChildCMP
+   extends org.jboss.test.cmp2.fkstackoverflow.ejb.ChildEntityBean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() 
+   {
+      super.ejbLoad();
+   }
+
+   public void ejbStore() 
+   {
+         super.ejbStore();
+   }
+
+   public void ejbActivate() 
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() 
+   {
+      super.ejbPassivate();
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) 
+   {
+      super.setEntityContext(ctx);
+   }
+
+   public void unsetEntityContext() 
+   {
+      super.unsetEntityContext();
+   }
+
+   public void ejbRemove() throws javax.ejb.RemoveException
+   {
+      super.ejbRemove();
+
+   }
+
+   public abstract java.lang.Long getId() ;
+
+   public abstract void setId( java.lang.Long id ) ;
+
+   public abstract java.lang.String getFirstName() ;
+
+   public abstract void setFirstName( java.lang.String firstName ) ;
+
+   public abstract java.lang.Long getSimpleParentId() ;
+
+   public abstract void setSimpleParentId( java.lang.Long simpleParentId ) ;
+
+   public abstract java.lang.Long getComplexParentId1() ;
+
+   public abstract void setComplexParentId1( java.lang.Long complexParentId1 ) ;
+
+   public abstract java.lang.Long getComplexParentId2() ;
+
+   public abstract void setComplexParentId2( java.lang.Long complexParentId2 ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,45 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Local interface for Child.
+ */
+public interface ChildLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.Long getId(  ) ;
+
+   public java.lang.String getFirstName(  ) ;
+
+   public java.lang.Long getSimpleParentId(  ) ;
+
+   public void setSimpleParentId( java.lang.Long parentId ) ;
+
+   public java.lang.Long getComplexParentId1(  ) ;
+
+   public void setComplexParentId1( java.lang.Long parentId ) ;
+
+   public java.lang.Long getComplexParentId2(  ) ;
+
+   public void setComplexParentId2( java.lang.Long parentId ) ;
+
+   public org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentLocal getSimpleParent1(  ) ;
+
+   public void setSimpleParent1( org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentLocal parent ) ;
+
+   public org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentLocal getSimpleParent2(  ) ;
+
+   public void setSimpleParent2( org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentLocal parent ) ;
+
+   public org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentLocal getComplexParent1(  ) ;
+
+   public void setComplexParent1( org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentLocal parent ) ;
+
+   public org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentLocal getComplexParent2(  ) ;
+
+   public void setComplexParent2( org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentLocal parent ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Local home interface for Child.
+ */
+public interface ChildLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ChildLocal";
+   public static final String JNDI_NAME="ChildLocal";
+
+   public org.jboss.test.cmp2.fkstackoverflow.ejb.ChildLocal create(java.lang.Long childId , java.lang.String firstName , java.lang.Long parentId)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.fkstackoverflow.ejb.ChildLocal findByPrimaryKey(java.lang.Long pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ChildUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Utility class for Child.
+ */
+public class ChildUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.fkstackoverflow.ejb.ChildLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for Child. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkstackoverflow.ejb.ChildLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.fkstackoverflow.ejb.ChildLocalHome) initialContext.lookup(org.jboss.test.cmp2.fkstackoverflow.ejb.ChildLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,63 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * CMP layer for ComplexParent.
+ */
+public abstract class ComplexParentCMP
+   extends org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentBean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() 
+   {
+      super.ejbLoad();
+   }
+
+   public void ejbStore() 
+   {
+         super.ejbStore();
+   }
+
+   public void ejbActivate() 
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() 
+   {
+      super.ejbPassivate();
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) 
+   {
+      super.setEntityContext(ctx);
+   }
+
+   public void unsetEntityContext() 
+   {
+      super.unsetEntityContext();
+   }
+
+   public void ejbRemove() throws javax.ejb.RemoveException
+   {
+      super.ejbRemove();
+
+   }
+
+   public abstract java.lang.Long getId1() ;
+
+   public abstract void setId1( java.lang.Long id1 ) ;
+
+   public abstract java.lang.Long getId2() ;
+
+   public abstract void setId2( java.lang.Long id2 ) ;
+
+   public abstract java.lang.String getFirstName() ;
+
+   public abstract void setFirstName( java.lang.String firstName ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,29 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Local interface for ComplexParent.
+ */
+public interface ComplexParentLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.Long getId1(  ) ;
+
+   public java.lang.Long getId2(  ) ;
+
+   public java.lang.String getFirstName(  ) ;
+
+   public void setFirstName( java.lang.String firstName ) ;
+
+   public java.util.Collection getChildren1(  ) ;
+
+   public void setChildren1( java.util.Collection children ) ;
+
+   public java.util.Collection getChildren2(  ) ;
+
+   public void setChildren2( java.util.Collection children ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Local home interface for ComplexParent.
+ */
+public interface ComplexParentLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ComplexParentLocal";
+   public static final String JNDI_NAME="ComplexParentLocal";
+
+   public org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentLocal create(java.lang.Long id1 , java.lang.Long id2 , java.lang.String firstName)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentLocal findByPrimaryKey(org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentPK pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentPK.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentPK.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentPK.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,123 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Primary key for ComplexParent.
+ */
+public class ComplexParentPK
+   extends java.lang.Object
+   implements java.io.Serializable
+{
+   private int _hashCode = 0;
+   private StringBuffer _toStringValue = null;
+
+   public java.lang.Long id1;
+   public java.lang.Long id2;
+
+   public ComplexParentPK()
+   {
+   }
+
+   public ComplexParentPK( java.lang.Long id1,java.lang.Long id2 )
+   {
+      this.id1 = id1;
+      this.id2 = id2;
+   }
+
+   public java.lang.Long getId1()
+   {
+      return id1;
+   }
+   public java.lang.Long getId2()
+   {
+      return id2;
+   }
+
+   public void setId1(java.lang.Long id1)
+   {
+      this.id1 = id1;
+      _hashCode = 0;
+   }
+   public void setId2(java.lang.Long id2)
+   {
+      this.id2 = id2;
+      _hashCode = 0;
+   }
+
+   public int hashCode()
+   {
+      if( _hashCode == 0 )
+      {
+         if (this.id1 != null) _hashCode += this.id1.hashCode();
+         if (this.id2 != null) _hashCode += this.id2.hashCode();
+      }
+
+      return _hashCode;
+   }
+
+   public boolean equals(Object obj)
+   {
+      if( !(obj instanceof org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentPK) )
+         return false;
+
+      org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentPK pk = (org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentPK)obj;
+      boolean eq = true;
+
+      if( obj == null )
+      {
+         eq = false;
+      }
+      else
+      {
+         if( this.id1 == null && ((org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentPK)obj).getId1() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.id1 == null || ((org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentPK)obj).getId1() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.id1.equals( pk.id1 );
+            }
+         }
+         if( this.id2 == null && ((org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentPK)obj).getId2() == null )
+         {
+            eq = true;
+         }
+         else
+         {
+            if( this.id2 == null || ((org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentPK)obj).getId2() == null )
+            {
+               eq = false;
+            }
+            else
+            {
+               eq = eq && this.id2.equals( pk.id2 );
+            }
+         }
+      }
+
+      return eq;
+   }
+
+   /** @return String representation of this pk in the form of [.field1.field2.field3]. */
+   public String toString()
+   {
+      if( _toStringValue == null )
+      {
+         _toStringValue = new StringBuffer("[.");
+         _toStringValue.append(this.id1).append('.');
+         _toStringValue.append(this.id2).append('.');
+         _toStringValue.append(']');
+      }
+
+      return _toStringValue.toString();
+   }
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/ComplexParentUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Utility class for ComplexParent.
+ */
+public class ComplexParentUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for ComplexParent. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentLocalHome) initialContext.lookup(org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/Facade.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/Facade.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/Facade.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,19 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Remote interface for Facade.
+ */
+public interface Facade
+   extends javax.ejb.EJBObject
+{
+
+   public void testSimple(  )
+      throws java.rmi.RemoteException;
+
+   public void testComplex(  )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Home interface for Facade.
+ */
+public interface FacadeHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/Facade";
+   public static final String JNDI_NAME="Facade";
+
+   public org.jboss.test.cmp2.fkstackoverflow.ejb.Facade create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeSession.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeSession.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeSession.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,37 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Session layer for Facade.
+ */
+public class FacadeSession
+   extends org.jboss.test.cmp2.fkstackoverflow.ejb.FacadeSessionBean
+   implements javax.ejb.SessionBean
+{
+   public void ejbActivate() 
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() 
+   {
+      super.ejbPassivate();
+   }
+
+   public void setSessionContext(javax.ejb.SessionContext ctx) 
+   {
+      super.setSessionContext(ctx);
+   }
+
+   public void unsetSessionContext() 
+   {
+   }
+
+   public void ejbRemove() 
+   {
+      super.ejbRemove();
+   }
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/FacadeUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,52 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Utility class for Facade.
+ */
+public class FacadeUtil
+{
+   /** Cached remote home (EJBHome). Uses lazy loading to obtain its value (loaded by getHome() methods). */
+   private static org.jboss.test.cmp2.fkstackoverflow.ejb.FacadeHome cachedRemoteHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain remote home interface from default initial context
+    * @return Home interface for Facade. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkstackoverflow.ejb.FacadeHome getHome() throws javax.naming.NamingException
+   {
+      if (cachedRemoteHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            java.lang.Object objRef = initialContext.lookup(org.jboss.test.cmp2.fkstackoverflow.ejb.FacadeHome.JNDI_NAME);
+            cachedRemoteHome = (org.jboss.test.cmp2.fkstackoverflow.ejb.FacadeHome) javax.rmi.PortableRemoteObject.narrow(objRef, org.jboss.test.cmp2.fkstackoverflow.ejb.FacadeHome.class);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedRemoteHome;
+   }
+
+   /**
+    * Obtain remote home interface from parameterised initial context
+    * @param environment Parameters to use for creating initial context
+    * @return Home interface for Facade. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkstackoverflow.ejb.FacadeHome getHome( java.util.Hashtable environment ) throws javax.naming.NamingException
+   {
+      // Obtain initial context
+      javax.naming.InitialContext initialContext = new javax.naming.InitialContext(environment);
+      try {
+         java.lang.Object objRef = initialContext.lookup(org.jboss.test.cmp2.fkstackoverflow.ejb.FacadeHome.JNDI_NAME);
+         return (org.jboss.test.cmp2.fkstackoverflow.ejb.FacadeHome) javax.rmi.PortableRemoteObject.narrow(objRef, org.jboss.test.cmp2.fkstackoverflow.ejb.FacadeHome.class);
+      } finally {
+         initialContext.close();
+      }
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,59 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * CMP layer for SimpleParent.
+ */
+public abstract class SimpleParentCMP
+   extends org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentBean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() 
+   {
+      super.ejbLoad();
+   }
+
+   public void ejbStore() 
+   {
+         super.ejbStore();
+   }
+
+   public void ejbActivate() 
+   {
+      super.ejbActivate();
+   }
+
+   public void ejbPassivate() 
+   {
+      super.ejbPassivate();
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) 
+   {
+      super.setEntityContext(ctx);
+   }
+
+   public void unsetEntityContext() 
+   {
+      super.unsetEntityContext();
+   }
+
+   public void ejbRemove() throws javax.ejb.RemoveException
+   {
+      super.ejbRemove();
+
+   }
+
+   public abstract java.lang.Long getId() ;
+
+   public abstract void setId( java.lang.Long id ) ;
+
+   public abstract java.lang.String getFirstName() ;
+
+   public abstract void setFirstName( java.lang.String firstName ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,27 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Local interface for SimpleParent.
+ */
+public interface SimpleParentLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.Long getId(  ) ;
+
+   public java.lang.String getFirstName(  ) ;
+
+   public void setFirstName( java.lang.String firstName ) ;
+
+   public java.util.Collection getChildren1(  ) ;
+
+   public void setChildren1( java.util.Collection children ) ;
+
+   public java.util.Collection getChildren2(  ) ;
+
+   public void setChildren2( java.util.Collection children ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Local home interface for SimpleParent.
+ */
+public interface SimpleParentLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/SimpleParentLocal";
+   public static final String JNDI_NAME="SimpleParentLocal";
+
+   public org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentLocal create(java.lang.Long id , java.lang.String firstName)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentLocal findByPrimaryKey(java.lang.Long pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/fkstackoverflow/ejb/SimpleParentUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,36 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.cmp2.fkstackoverflow.ejb;
+
+/**
+ * Utility class for SimpleParent.
+ */
+public class SimpleParentUtil
+{
+
+   /** Cached local home (EJBLocalHome). Uses lazy loading to obtain its value (loaded by getLocalHome() methods). */
+   private static org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentLocalHome cachedLocalHome = null;
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for SimpleParent. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      if (cachedLocalHome == null) {
+         // Obtain initial context
+         javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+         try {
+            cachedLocalHome = (org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentLocalHome) initialContext.lookup(org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentLocalHome.JNDI_NAME);
+         } finally {
+            initialContext.close();
+         }
+      }
+      return cachedLocalHome;
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR1CMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR1CMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR1CMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,56 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.idxandusersql.ejb;
+
+/**
+ * CMP layer for CMR1.
+ */
+public abstract class CMR1CMP
+   extends org.jboss.test.cmp2.idxandusersql.ejb.CMR1Bean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() 
+   {
+   }
+
+   public void ejbStore() 
+   {
+   }
+
+   public void ejbActivate() 
+   {
+   }
+
+   public void ejbPassivate() 
+   {
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) 
+   {
+   }
+
+   public void unsetEntityContext() 
+   {
+   }
+
+   public void ejbRemove() throws javax.ejb.RemoveException
+   {
+
+   }
+
+   public abstract java.lang.String getPKey() ;
+
+   public abstract void setPKey( java.lang.String PKey ) ;
+
+   public abstract java.lang.String getFoo1() ;
+
+   public abstract void setFoo1( java.lang.String foo1 ) ;
+
+   public abstract java.lang.String getBar1() ;
+
+   public abstract void setBar1( java.lang.String bar1 ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR1Local.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR1Local.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR1Local.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,27 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.idxandusersql.ejb;
+
+/**
+ * Local interface for CMR1.
+ */
+public interface CMR1Local
+   extends javax.ejb.EJBLocalObject
+{
+
+   public void setPKey( java.lang.String pKey ) ;
+
+   public java.lang.String getPKey(  ) ;
+
+   /**
+    * This field gets a <dbindex/> that we want to look up in the database to see if the index was really created on the file.
+    * @todo set the dbindex property here with a modern xdoclet*    */
+   public java.lang.String getFoo1(  ) ;
+
+   /**
+    * This one is not indexed
+    */
+   public java.lang.String getBar1(  ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR1LocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR1LocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR1LocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.idxandusersql.ejb;
+
+/**
+ * Local home interface for CMR1.
+ */
+public interface CMR1LocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/CMR1Local";
+   public static final String JNDI_NAME="CMR1Local";
+
+   public org.jboss.test.cmp2.idxandusersql.ejb.CMR1Local create()
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.idxandusersql.ejb.CMR1Local findByPrimaryKey(java.lang.String pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR2CMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR2CMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR2CMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,56 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.idxandusersql.ejb;
+
+/**
+ * CMP layer for CMR2.
+ */
+public abstract class CMR2CMP
+   extends org.jboss.test.cmp2.idxandusersql.ejb.CMR2Bean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() 
+   {
+   }
+
+   public void ejbStore() 
+   {
+   }
+
+   public void ejbActivate() 
+   {
+   }
+
+   public void ejbPassivate() 
+   {
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) 
+   {
+   }
+
+   public void unsetEntityContext() 
+   {
+   }
+
+   public void ejbRemove() throws javax.ejb.RemoveException
+   {
+
+   }
+
+   public abstract java.lang.String getPKey2() ;
+
+   public abstract void setPKey2( java.lang.String PKey2 ) ;
+
+   public abstract java.lang.String getFoo2() ;
+
+   public abstract void setFoo2( java.lang.String foo2 ) ;
+
+   public abstract java.lang.String getBar2() ;
+
+   public abstract void setBar2( java.lang.String bar2 ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR2Local.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR2Local.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR2Local.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,31 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.idxandusersql.ejb;
+
+/**
+ * Local interface for CMR2.
+ */
+public interface CMR2Local
+   extends javax.ejb.EJBLocalObject
+{
+
+   public void setPKey2( java.lang.String pKey2 ) ;
+
+   public java.lang.String getPKey2(  ) ;
+
+   /**
+    * This field gets a <dbindex/> that we want to look up in the database to see if the index was really created on the file.
+    * @todo set the dbindex property here with a modern xdoclet*    */
+   public java.lang.String getFoo2(  ) ;
+
+   /**
+    * This one is not indexed
+    */
+   public java.lang.String getBar2(  ) ;
+
+   public java.util.Collection getIdxs(  ) ;
+
+   public void setIdxs( java.util.Collection Idxs ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR2LocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR2LocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/CMR2LocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.idxandusersql.ejb;
+
+/**
+ * Local home interface for CMR2.
+ */
+public interface CMR2LocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/CMR2Local";
+   public static final String JNDI_NAME="CMR2Local";
+
+   public org.jboss.test.cmp2.idxandusersql.ejb.CMR2Local create()
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.idxandusersql.ejb.CMR2Local findByPrimaryKey(java.lang.String pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/DBIndexTestCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/DBIndexTestCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/DBIndexTestCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,60 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.idxandusersql.ejb;
+
+/**
+ * CMP layer for DBIndexTest.
+ */
+public abstract class DBIndexTestCMP
+   extends org.jboss.test.cmp2.idxandusersql.ejb.DBIndexTestBean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() 
+   {
+   }
+
+   public void ejbStore() 
+   {
+   }
+
+   public void ejbActivate() 
+   {
+   }
+
+   public void ejbPassivate() 
+   {
+
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) 
+   {
+   }
+
+   public void unsetEntityContext() 
+   {
+   }
+
+   public void ejbRemove() throws javax.ejb.RemoveException
+   {
+
+   }
+
+   public abstract java.lang.String getPKey() ;
+
+   public abstract void setPKey( java.lang.String PKey ) ;
+
+   public abstract java.lang.String getFoo() ;
+
+   public abstract void setFoo( java.lang.String foo ) ;
+
+   public abstract java.lang.String getBar() ;
+
+   public abstract void setBar( java.lang.String bar ) ;
+
+   public abstract java.lang.String getBaz() ;
+
+   public abstract void setBaz( java.lang.String baz ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/DBIndexTestLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/DBIndexTestLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/DBIndexTestLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,40 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.idxandusersql.ejb;
+
+/**
+ * Local interface for DBIndexTest.
+ */
+public interface DBIndexTestLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public void setPKey( java.lang.String pKey ) ;
+
+   public java.lang.String getPKey(  ) ;
+
+   /**
+    * This field gets a <dbindex/> that we want to look up in the database to see if the index was really created on the file.
+    * @todo set the dbindex property here with a modern xdoclet*    */
+   public java.lang.String getFoo(  ) ;
+
+   /**
+    * This field gets an index via the <post-create-sql/> setting in jbosscmp-jdbc.xml file
+    * @todo set the dbindex property here with a modern xdoclet    */
+   public java.lang.String getBar(  ) ;
+
+   /**
+    * This field is not indexed
+    */
+   public java.lang.String getBaz(  ) ;
+
+   public java.util.Collection getCmr1s(  ) ;
+
+   public void setCmr1s( java.util.Collection cmr1s ) ;
+
+   public java.util.Collection getCmr2s(  ) ;
+
+   public void setCmr2s( java.util.Collection cmr2s ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/DBIndexTestLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/DBIndexTestLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/ejb/DBIndexTestLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.idxandusersql.ejb;
+
+/**
+ * Local home interface for DBIndexTest.
+ */
+public interface DBIndexTestLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/DBIndexTestLocal";
+   public static final String JNDI_NAME="DBIndexTestLocal";
+
+   public org.jboss.test.cmp2.idxandusersql.ejb.DBIndexTestLocal create()
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.idxandusersql.ejb.DBIndexTestLocal findByPrimaryKey(java.lang.String pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/CmpEntityLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/CmpEntityLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/CmpEntityLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,43 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.optimisticlock.interfaces;
+
+/**
+ * Local interface for CmpEntity.
+ */
+public interface CmpEntityLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.Integer getId(  ) ;
+
+   public java.lang.String getStringGroup1(  ) ;
+
+   public void setStringGroup1( java.lang.String stringField ) ;
+
+   public java.lang.Integer getIntegerGroup1(  ) ;
+
+   public void setIntegerGroup1( java.lang.Integer value ) ;
+
+   public java.lang.Double getDoubleGroup1(  ) ;
+
+   public void setDoubleGroup1( java.lang.Double value ) ;
+
+   public java.lang.String getStringGroup2(  ) ;
+
+   public void setStringGroup2( java.lang.String stringField ) ;
+
+   public java.lang.Integer getIntegerGroup2(  ) ;
+
+   public void setIntegerGroup2( java.lang.Integer value ) ;
+
+   public java.lang.Double getDoubleGroup2(  ) ;
+
+   public void setDoubleGroup2( java.lang.Double value ) ;
+
+   public java.lang.Long getVersionField(  ) ;
+
+   public void setVersionField( java.lang.Long value ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/CmpEntityLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/CmpEntityLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/CmpEntityLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,24 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.optimisticlock.interfaces;
+
+/**
+ * Local home interface for CmpEntity.
+ */
+public interface CmpEntityLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/CmpEntityLocal";
+   public static final String JNDI_NAME="local/CmpEntityBean";
+
+   public org.jboss.test.cmp2.optimisticlock.interfaces.CmpEntityLocal create(java.lang.Integer id , java.lang.String stringGroup1 , java.lang.Integer integerGroup1 , java.lang.Double doubleGroup1 , java.lang.String stringGroup2 , java.lang.Integer integerGroup2 , java.lang.Double doubleGroup2)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.optimisticlock.interfaces.CmpEntityLocal findById(java.lang.Integer id)
+      throws javax.ejb.FinderException;
+
+   public org.jboss.test.cmp2.optimisticlock.interfaces.CmpEntityLocal findByPrimaryKey(java.lang.Integer pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/Facade.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/Facade.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/Facade.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,70 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.optimisticlock.interfaces;
+
+/**
+ * Remote interface for Facade.
+ */
+public interface Facade
+   extends javax.ejb.EJBObject
+{
+
+   public void createCmpEntity( java.lang.String jndiName,java.lang.Integer id,java.lang.String stringGroup1,java.lang.Integer integerGroup1,java.lang.Double doubleGroup1,java.lang.String stringGroup2,java.lang.Integer integerGroup2,java.lang.Double doubleGroup2 )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void safeRemove( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testNullLockedFields( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testKeygenStrategyPass( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testKeygenStrategyFail( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testTimestampStrategyPass( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testTimestampStrategyFail( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testVersionStrategyPass( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testVersionStrategyFail( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testGroupStrategyPass( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testGroupStrategyFail( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testReadStrategyPass( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testReadStrategyFail( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testModifiedStrategyPass( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testModifiedStrategyFail( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void modifyGroup2InRequiresNew( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void modifyGroup1InRequiresNew( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testUpdateLockOnSync( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void testExplicitVersionUpdateOnSync( java.lang.String jndiName,java.lang.Integer id )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/FacadeHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/FacadeHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/optimisticlock/interfaces/FacadeHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.optimisticlock.interfaces;
+
+/**
+ * Home interface for Facade.
+ */
+public interface FacadeHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/Facade";
+   public static final String JNDI_NAME="FacadeBean";
+
+   public org.jboss.test.cmp2.optimisticlock.interfaces.Facade create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntity.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntity.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntity.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,28 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.passivation.interfaces;
+
+/**
+ * Remote interface for RapidlyPassivatedEntity.
+ */
+public interface RapidlyPassivatedEntity
+   extends javax.ejb.EJBObject
+{
+
+   public java.lang.String getData(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Return the pk of the object returned by {@link EntityContext#getEJBLocalObject}
+    */
+   public java.lang.Object getIdViaEJBLocalObject(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Return the pk of the object returned by {@link EntityContext#getEJBObject}
+    */
+   public java.lang.Object getIdViaEJBObject(  )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntityHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntityHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntityHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.passivation.interfaces;
+
+/**
+ * Home interface for RapidlyPassivatedEntity.
+ */
+public interface RapidlyPassivatedEntityHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/RapidlyPassivatedEntity";
+   public static final String JNDI_NAME="ejb/remote/RapidlyPassivatedEntity";
+
+   public org.jboss.test.cmp2.passivation.interfaces.RapidlyPassivatedEntity create(java.lang.String s)
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+   public org.jboss.test.cmp2.passivation.interfaces.RapidlyPassivatedEntity findByPrimaryKey(java.lang.Object pk)
+      throws javax.ejb.FinderException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntityLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntityLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntityLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,25 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.passivation.interfaces;
+
+/**
+ * Local interface for RapidlyPassivatedEntity.
+ */
+public interface RapidlyPassivatedEntityLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.String getData(  ) ;
+
+   /**
+    * Return the pk of the object returned by {@link EntityContext#getEJBLocalObject}
+    */
+   public java.lang.Object getIdViaEJBLocalObject(  ) ;
+
+   /**
+    * Return the pk of the object returned by {@link EntityContext#getEJBObject}
+    */
+   public java.lang.Object getIdViaEJBObject(  ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntityLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntityLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/passivation/interfaces/RapidlyPassivatedEntityLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.cmp2.passivation.interfaces;
+
+/**
+ * Local home interface for RapidlyPassivatedEntity.
+ */
+public interface RapidlyPassivatedEntityLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/RapidlyPassivatedEntityLocal";
+   public static final String JNDI_NAME="ejb/local/RapidlyPassivatedEntity";
+
+   public org.jboss.test.cmp2.passivation.interfaces.RapidlyPassivatedEntityLocal create(java.lang.String s)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.cmp2.passivation.interfaces.RapidlyPassivatedEntityLocal findByPrimaryKey(java.lang.Object pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsCmp2Bean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsCmp2Bean.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cts/ejb/CtsCmp2Bean.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,80 @@
+package org.jboss.test.cts.ejb;
+
+import javax.ejb.CreateException;
+import javax.ejb.CreateException;
+import javax.ejb.EntityBean;
+import javax.ejb.EntityContext;
+
+import org.apache.log4j.Category;
+
+/**
+ @author Scott.Stark at jboss.org
+ @version $Revision: 23153 $
+ */
+public abstract class CtsCmp2Bean implements EntityBean
+{
+   private static String VERSION = "CtsCmp2BeanV2";
+   private static Category log = Category.getInstance(CtsCmp2Bean.class);
+   private EntityContext ctx;
+
+   public String ejbCreate(String key, String data)
+      throws CreateException
+   {
+      log.debug("ejbCreate '" + key + "' "+ data+", version="+VERSION);
+      setKey(key);
+      setData(data);
+      return null;
+   }
+
+   public void ejbPostCreate(String key, String data)
+   {
+      log.debug("ejbPostCreate'" + key + "' "+ data);
+   }
+
+   // CMP field accessors -----------------------------------------------------
+   public abstract String getKey();
+   public abstract void setKey(String param);
+   public abstract String getData();
+   public abstract void setData(String param);
+   public abstract String getMoreData();
+   public abstract void setMoreData(String param);
+
+// EJB callbacks
+   public void ejbLoad ()
+   {
+      log.debug("ejbLoad () called");
+
+   }
+
+   public void ejbStore ()
+   {
+      log.debug("ejbStore () called");
+   }
+
+   public void ejbRemove ()
+   {
+      log.debug("ejbRemove () called");
+   }
+
+   public void ejbActivate ()
+   {
+      log.debug("ejbActivate () called");
+   }
+
+   public void ejbPassivate ()
+   {
+      log.debug("ejbPassivate () called");
+   }
+
+   public void setEntityContext (EntityContext ctx)
+   {
+      log.debug("setEntityContext () called");
+      this.ctx = ctx;
+   }
+
+   public void unsetEntityContext ()
+   {
+      log.debug("unsetEntityContext () called");
+      ctx = null;
+   }
+}

Added: trunk/testsuite/src/main/org/jboss/test/cts/interfaces/CtsCmp2Local.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/interfaces/CtsCmp2Local.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cts/interfaces/CtsCmp2Local.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,14 @@
+package org.jboss.test.cts.interfaces;
+
+import javax.ejb.EJBLocalObject;
+
+/**
+ @author Scott.Stark at jboss.org
+ @version $Revision: 8726 $
+ */
+public interface CtsCmp2Local extends EJBLocalObject
+{
+   public String getKey();
+   public String getData();
+   public String getMoreData();
+}

Added: trunk/testsuite/src/main/org/jboss/test/cts/service/CtsCmpService.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cts/service/CtsCmpService.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/cts/service/CtsCmpService.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, the OpenSource J2EE WebOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.test.cts.service;
+
+import javax.naming.InitialContext;
+
+import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.test.cts.interfaces.CtsCmp2Local;
+import org.jboss.test.cts.interfaces.CtsCmp2LocalHome;
+import org.jboss.test.util.Debug;
+
+/** Version 2 of the MBean service that uses the version 2 of the
+ * CtsCmp2Local EJB interface.
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 16662 $
+ */
+public class CtsCmpService extends ServiceMBeanSupport
+   implements CtsCmpServiceMBean
+{
+   private CtsCmp2LocalHome home;
+   private String homeJndiName = "v2/local/CtsCmp2Bean";
+
+   public CtsCmpService()
+   {
+      log.info("CtsCmpService V2 ctor");
+   }
+
+   public void setHomeJndiName(String jndiName)
+   {
+      this.homeJndiName = jndiName;
+   }
+
+   protected void startService() throws Exception
+   {
+      InitialContext ctx = new InitialContext();
+      Object obj = new InitialContext().lookup(homeJndiName);
+      Class homeClass = obj.getClass();
+      StringBuffer results = new StringBuffer();
+      results.append("CtsCmpService V2 class info:\n");
+      Debug.displayClassInfo(getClass(), results);
+      results.append("CtsCmp2LocalHome Proxy class info:\n");
+      Debug.displayClassInfo(homeClass, results);
+      results.append("\nLocal CtsCmp2LocalHome.class info:\n");
+      Debug.displayClassInfo(CtsCmp2LocalHome.class, results);
+      log.info(results.toString());
+      home = (CtsCmp2LocalHome) obj;
+
+      CtsCmp2Local bean = home.create("V2key", "V2data");
+      log.info("CtsCmp2Local.key = "+bean.getKey());
+      log.info("CtsCmp2Local.data = "+bean.getData());
+      log.info("CtsCmp2Local.moreData = "+bean.getMoreData());
+   }
+}

Added: trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnly.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnly.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnly.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,33 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.ejbconf.beans.interfaces;
+
+/**
+ * Remote interface for ReadOnly.
+ */
+public interface ReadOnly
+   extends javax.ejb.EJBObject
+{
+   /**
+    * Get the value of id.
+    * @return value of id.
+    */
+   public java.lang.Integer getId(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Get the value of value.
+    * @return value of value.
+    */
+   public java.lang.Integer getValue(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Set the value of value.
+    * @param v Value to assign to value.
+    */
+   public void setValue( java.lang.Integer value )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyHelper.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyHelper.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyHelper.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,25 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.ejbconf.beans.interfaces;
+
+/**
+ * Remote interface for ReadOnlyHelper.
+ */
+public interface ReadOnlyHelper
+   extends javax.ejb.EJBObject
+{
+   /**
+    * Describe <code>setUp</code> method here.
+    * @exception CreateException if an error occurs
+    */
+   public void setUp(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Describe <code>checkValue</code> method here.
+    */
+   public int checkValue(  )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyHelperHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyHelperHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyHelperHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.ejbconf.beans.interfaces;
+
+/**
+ * Home interface for ReadOnlyHelper.
+ */
+public interface ReadOnlyHelperHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ReadOnlyHelper";
+   public static final String JNDI_NAME="ReadOnlyHelper";
+
+   public org.jboss.test.ejbconf.beans.interfaces.ReadOnlyHelper create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,24 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.ejbconf.beans.interfaces;
+
+/**
+ * Home interface for ReadOnly.
+ */
+public interface ReadOnlyHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ReadOnly";
+   public static final String JNDI_NAME="ReadOnly";
+
+   public org.jboss.test.ejbconf.beans.interfaces.ReadOnly create(java.lang.Integer id , java.lang.Integer value)
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+   public java.util.Collection findAll()
+      throws javax.ejb.FinderException,java.rmi.RemoteException;
+
+   public org.jboss.test.ejbconf.beans.interfaces.ReadOnly findByPrimaryKey(java.lang.Integer pk)
+      throws javax.ejb.FinderException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,30 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.ejbconf.beans.interfaces;
+
+/**
+ * Local interface for ReadOnly.
+ */
+public interface ReadOnlyLocal
+   extends javax.ejb.EJBLocalObject
+{
+   /**
+    * Get the value of id.
+    * @return value of id.
+    */
+   public java.lang.Integer getId(  ) ;
+
+   /**
+    * Get the value of value.
+    * @return value of value.
+    */
+   public java.lang.Integer getValue(  ) ;
+
+   /**
+    * Set the value of value.
+    * @param v Value to assign to value.
+    */
+   public void setValue( java.lang.Integer value ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/ejbconf/beans/interfaces/ReadOnlyLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,24 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.ejbconf.beans.interfaces;
+
+/**
+ * Local home interface for ReadOnly.
+ */
+public interface ReadOnlyLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ReadOnlyLocal";
+   public static final String JNDI_NAME="LocalReadOnly";
+
+   public org.jboss.test.ejbconf.beans.interfaces.ReadOnlyLocal create(java.lang.Integer id , java.lang.Integer value)
+      throws javax.ejb.CreateException;
+
+   public java.util.Collection findAll()
+      throws javax.ejb.FinderException;
+
+   public org.jboss.test.ejbconf.beans.interfaces.ReadOnlyLocal findByPrimaryKey(java.lang.Integer pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/entity/beans/TestEntityCMP.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/entity/beans/TestEntityCMP.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/entity/beans/TestEntityCMP.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,76 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.entity.beans;
+
+/**
+ * CMP layer for TestEntity.
+ */
+public abstract class TestEntityCMP
+   extends org.jboss.test.entity.beans.TestEntityBean
+   implements javax.ejb.EntityBean
+{
+
+   public void ejbLoad() 
+   {
+   }
+
+   public void ejbStore() 
+   {
+   }
+
+   public void ejbActivate() 
+   {
+   }
+
+   public void ejbPassivate() 
+   {
+
+      TestEntityValue = null;
+   }
+
+   public void setEntityContext(javax.ejb.EntityContext ctx) 
+   {
+   }
+
+   public void unsetEntityContext() 
+   {
+   }
+
+   public void ejbRemove() throws javax.ejb.RemoveException
+   {
+
+   }
+
+ /* Value Objects BEGIN */
+
+   private org.jboss.test.entity.interfaces.TestEntityValue TestEntityValue = null;
+
+   public org.jboss.test.entity.interfaces.TestEntityValue getTestEntityValue()
+   {
+      TestEntityValue = new org.jboss.test.entity.interfaces.TestEntityValue();
+      try
+         {
+            TestEntityValue.setEntityID( getEntityID() );
+            TestEntityValue.setValue1( getValue1() );
+
+         }
+         catch (Exception e)
+         {
+            throw new javax.ejb.EJBException(e);
+         }
+
+	  return TestEntityValue;
+   }
+
+/* Value Objects END */
+
+   public abstract java.lang.String getEntityID() ;
+
+   public abstract void setEntityID( java.lang.String entityID ) ;
+
+   public abstract java.lang.String getValue1() ;
+
+   public abstract void setValue1( java.lang.String value1 ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntity.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntity.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntity.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,22 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.entity.interfaces;
+
+/**
+ * Remote interface for TestEntity.
+ */
+public interface TestEntity
+   extends javax.ejb.EJBObject
+{
+
+   public java.lang.String getEntityID(  )
+      throws java.rmi.RemoteException;
+
+   public java.lang.String getValue1(  )
+      throws java.rmi.RemoteException;
+
+   public void setValue1( java.lang.String value1 )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,27 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.entity.interfaces;
+
+/**
+ * Home interface for TestEntity.
+ */
+public interface TestEntityHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/TestEntity";
+   public static final String JNDI_NAME="test/entity/TestEntity";
+
+   public org.jboss.test.entity.interfaces.TestEntity create(org.jboss.test.entity.interfaces.TestEntityValue value)
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+   public org.jboss.test.entity.interfaces.TestEntity findByPrimaryKey(java.lang.String pk)
+      throws javax.ejb.FinderException,java.rmi.RemoteException;
+
+   public void removeExternal(java.lang.String entityID)
+      throws java.rmi.RemoteException;
+
+   public void changeValue1(java.lang.String entityID,java.lang.String value1)
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,19 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.entity.interfaces;
+
+/**
+ * Local interface for TestEntity.
+ */
+public interface TestEntityLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.String getEntityID(  ) ;
+
+   public java.lang.String getValue1(  ) ;
+
+   public void setValue1( java.lang.String value1 ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,25 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.entity.interfaces;
+
+/**
+ * Local home interface for TestEntity.
+ */
+public interface TestEntityLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/TestEntityLocal";
+   public static final String JNDI_NAME="test/entity/TestEntityLocal";
+
+   public org.jboss.test.entity.interfaces.TestEntityLocal create(org.jboss.test.entity.interfaces.TestEntityValue value)
+      throws javax.ejb.CreateException;
+
+   public org.jboss.test.entity.interfaces.TestEntityLocal findByPrimaryKey(java.lang.String pk)
+      throws javax.ejb.FinderException;
+
+   public void removeExternal(java.lang.String entityID) ;
+
+   public void changeValue1(java.lang.String entityID,java.lang.String value1) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityUtil.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityUtil.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,63 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.entity.interfaces;
+
+/**
+ * Utility class for TestEntity.
+ */
+public class TestEntityUtil
+{
+
+   // Home interface lookup methods
+
+   /**
+    * Obtain remote home interface from default initial context
+    * @return Home interface for TestEntity. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.entity.interfaces.TestEntityHome getHome() throws javax.naming.NamingException
+   {
+      // Obtain initial context
+      javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+      try {
+         java.lang.Object objRef = initialContext.lookup(org.jboss.test.entity.interfaces.TestEntityHome.JNDI_NAME);
+         return (org.jboss.test.entity.interfaces.TestEntityHome) javax.rmi.PortableRemoteObject.narrow(objRef, org.jboss.test.entity.interfaces.TestEntityHome.class);
+      } finally {
+         initialContext.close();
+      }
+   }
+
+   /**
+    * Obtain remote home interface from parameterised initial context
+    * @param environment Parameters to use for creating initial context
+    * @return Home interface for TestEntity. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.entity.interfaces.TestEntityHome getHome( java.util.Hashtable environment ) throws javax.naming.NamingException
+   {
+      // Obtain initial context
+      javax.naming.InitialContext initialContext = new javax.naming.InitialContext(environment);
+      try {
+         java.lang.Object objRef = initialContext.lookup(org.jboss.test.entity.interfaces.TestEntityHome.JNDI_NAME);
+         return (org.jboss.test.entity.interfaces.TestEntityHome) javax.rmi.PortableRemoteObject.narrow(objRef, org.jboss.test.entity.interfaces.TestEntityHome.class);
+      } finally {
+         initialContext.close();
+      }
+   }
+
+   /**
+    * Obtain local home interface from default initial context
+    * @return Local home interface for TestEntity. Lookup using JNDI_NAME
+    */
+   public static org.jboss.test.entity.interfaces.TestEntityLocalHome getLocalHome() throws javax.naming.NamingException
+   {
+      // Local homes shouldn't be narrowed, as there is no RMI involved.
+      // Obtain initial context
+      javax.naming.InitialContext initialContext = new javax.naming.InitialContext();
+      try {
+         return (org.jboss.test.entity.interfaces.TestEntityLocalHome) initialContext.lookup(org.jboss.test.entity.interfaces.TestEntityLocalHome.JNDI_NAME);
+      } finally {
+         initialContext.close();
+      }
+   }
+
+}
\ No newline at end of file

Added: trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityValue.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityValue.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/entity/interfaces/TestEntityValue.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,174 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.entity.interfaces;
+
+import java.util.*;
+
+/**
+ * Value object for TestEntity.
+ *
+ */
+public class TestEntityValue
+   extends  
+java.lang.Object 
+   implements java.io.Serializable 
+{
+   private java.lang.String entityID;
+   private boolean entityIDHasBeenSet = false;
+   private java.lang.String value1;
+   private boolean value1HasBeenSet = false;
+
+   private java.lang.String pk;
+
+   public TestEntityValue()
+   {
+   }
+
+   public TestEntityValue( java.lang.String entityID,java.lang.String value1 )
+   {
+	  this.entityID = entityID;
+	  entityIDHasBeenSet = true;
+	  this.value1 = value1;
+	  value1HasBeenSet = true;
+	  pk = this.getEntityID();
+   }
+
+   //TODO Cloneable is better than this !
+   public TestEntityValue( TestEntityValue otherValue )
+   {
+	  this.entityID = otherValue.entityID;
+	  entityIDHasBeenSet = true;
+	  this.value1 = otherValue.value1;
+	  value1HasBeenSet = true;
+
+	  pk = this.getEntityID();
+   }
+
+   public java.lang.String getPrimaryKey()
+   {
+	  return pk;
+   }
+
+   public void setPrimaryKey( java.lang.String pk )
+   {
+      // it's also nice to update PK object - just in case
+      // somebody would ask for it later...
+      this.pk = pk;
+	  setEntityID( pk );
+   }
+
+   public java.lang.String getEntityID()
+   {
+	  return this.entityID;
+   }
+
+   public void setEntityID( java.lang.String entityID )
+   {
+	  this.entityID = entityID;
+	  entityIDHasBeenSet = true;
+
+		  pk = entityID;
+   }
+
+   public boolean entityIDHasBeenSet(){
+	  return entityIDHasBeenSet;
+   }
+   public java.lang.String getValue1()
+   {
+	  return this.value1;
+   }
+
+   public void setValue1( java.lang.String value1 )
+   {
+	  this.value1 = value1;
+	  value1HasBeenSet = true;
+
+   }
+
+   public boolean value1HasBeenSet(){
+	  return value1HasBeenSet;
+   }
+
+   public String toString()
+   {
+	  StringBuffer str = new StringBuffer("{");
+
+	  str.append("entityID=" + getEntityID() + " " + "value1=" + getValue1());
+	  str.append('}');
+
+	  return(str.toString());
+   }
+
+   /**
+    * A Value Object has an identity if the attributes making its Primary Key have all been set. An object without identity is never equal to any other object.
+    *
+    * @return true if this instance has an identity.
+    */
+   protected boolean hasIdentity()
+   {
+	  return entityIDHasBeenSet;
+   }
+
+   public boolean equals(Object other)
+   {
+      if (this == other)
+         return true;
+	  if ( ! hasIdentity() ) return false;
+	  if (other instanceof TestEntityValue)
+	  {
+		 TestEntityValue that = (TestEntityValue) other;
+		 if ( ! that.hasIdentity() ) return false;
+		 boolean lEquals = true;
+
+		 lEquals = lEquals && isIdentical(that);
+
+		 return lEquals;
+	  }
+	  else
+	  {
+		 return false;
+	  }
+   }
+
+   public boolean isIdentical(Object other)
+   {
+	  if (other instanceof TestEntityValue)
+	  {
+		 TestEntityValue that = (TestEntityValue) other;
+		 boolean lEquals = true;
+		 if( this.entityID == null )
+		 {
+			lEquals = lEquals && ( that.entityID == null );
+		 }
+		 else
+		 {
+			lEquals = lEquals && this.entityID.equals( that.entityID );
+		 }
+		 if( this.value1 == null )
+		 {
+			lEquals = lEquals && ( that.value1 == null );
+		 }
+		 else
+		 {
+			lEquals = lEquals && this.value1.equals( that.value1 );
+		 }
+
+		 return lEquals;
+	  }
+	  else
+	  {
+		 return false;
+	  }
+   }
+
+   public int hashCode(){
+	  int result = 17;
+      result = 37*result + ((this.entityID != null) ? this.entityID.hashCode() : 0);
+
+      result = 37*result + ((this.value1 != null) ? this.value1.hashCode() : 0);
+
+	  return result;
+   }
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/deployer/BrokenDeployerMBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/deployer/BrokenDeployerMBean.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/deployer/BrokenDeployerMBean.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,14 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.jmx.deployer;
+
+/**
+ * MBean interface.
+ */
+public interface BrokenDeployerMBean {
+
+   //default object name
+   public static final javax.management.ObjectName OBJECT_NAME = org.jboss.mx.util.ObjectNameFactory.create("jboss.test:service=BrokenDeployer");
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentAEJB.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentAEJB.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentAEJB.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,16 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardepends.dependent.interfaces;
+
+/**
+ * Remote interface for DependentAEJB.
+ */
+public interface DependentAEJB
+   extends javax.ejb.EJBObject
+{
+
+   public java.lang.Object echo( java.lang.Object value )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentAEJBHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentAEJBHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentAEJBHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardepends.dependent.interfaces;
+
+/**
+ * Home interface for DependentAEJB.
+ */
+public interface DependentAEJBHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/DependentAEJB";
+   public static final String JNDI_NAME="test/DependentA";
+
+   public org.jboss.test.jmx.eardepends.dependent.interfaces.DependentAEJB create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentBEJB.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentBEJB.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentBEJB.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,16 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardepends.dependent.interfaces;
+
+/**
+ * Remote interface for DependentBEJB.
+ */
+public interface DependentBEJB
+   extends javax.ejb.EJBObject
+{
+
+   public java.lang.Object echo( java.lang.Object value )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentBEJBHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentBEJBHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/dependent/interfaces/DependentBEJBHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardepends.dependent.interfaces;
+
+/**
+ * Home interface for DependentBEJB.
+ */
+public interface DependentBEJBHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/DependentBEJB";
+   public static final String JNDI_NAME="test/DependentB";
+
+   public org.jboss.test.jmx.eardepends.dependent.interfaces.DependentBEJB create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/independent/interfaces/IndependentEJB.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/independent/interfaces/IndependentEJB.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/independent/interfaces/IndependentEJB.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,16 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardepends.independent.interfaces;
+
+/**
+ * Remote interface for IndependentEJB.
+ */
+public interface IndependentEJB
+   extends javax.ejb.EJBObject
+{
+
+   public java.lang.Object echo( java.lang.Object value )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/independent/interfaces/IndependentEJBHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/independent/interfaces/IndependentEJBHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardepends/independent/interfaces/IndependentEJBHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardepends.independent.interfaces;
+
+/**
+ * Home interface for IndependentEJB.
+ */
+public interface IndependentEJBHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/IndependentEJB";
+   public static final String JNDI_NAME="test/Independent";
+
+   public org.jboss.test.jmx.eardepends.independent.interfaces.IndependentEJB create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionA.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionA.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionA.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,25 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardeployment.a.interfaces;
+
+/**
+ * Remote interface for SessionA.
+ */
+public interface SessionA
+   extends javax.ejb.EJBObject
+{
+   /**
+    * Describe <code>callB</code> method here.
+    * @exception RemoteException if an error occurs
+    */
+   public boolean callB(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Describe <code>doNothing</code> method here.
+    */
+   public void doNothing(  )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionAHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionAHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionAHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardeployment.a.interfaces;
+
+/**
+ * Home interface for SessionA.
+ */
+public interface SessionAHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/SessionA";
+   public static final String JNDI_NAME="eardeployment/SessionA";
+
+   public org.jboss.test.jmx.eardeployment.a.interfaces.SessionA create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionALocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionALocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionALocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,23 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardeployment.a.interfaces;
+
+/**
+ * Local interface for SessionA.
+ */
+public interface SessionALocal
+   extends javax.ejb.EJBLocalObject
+{
+   /**
+    * Describe <code>callB</code> method here.
+    * @exception RemoteException if an error occurs
+    */
+   public boolean callB(  ) ;
+
+   /**
+    * Describe <code>doNothing</code> method here.
+    */
+   public void doNothing(  ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionALocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionALocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/a/interfaces/SessionALocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardeployment.a.interfaces;
+
+/**
+ * Local home interface for SessionA.
+ */
+public interface SessionALocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/SessionALocal";
+   public static final String JNDI_NAME="eardeployment/LocalSessionA";
+
+   public org.jboss.test.jmx.eardeployment.a.interfaces.SessionALocal create()
+      throws javax.ejb.CreateException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionB.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionB.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionB.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,24 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardeployment.b.interfaces;
+
+/**
+ * Remote interface for SessionB.
+ */
+public interface SessionB
+   extends javax.ejb.EJBObject
+{
+   /**
+    * Describe <code>callA</code> method here.
+    */
+   public boolean callA(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Describe <code>doNothing</code> method here.
+    */
+   public void doNothing(  )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionBHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionBHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionBHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardeployment.b.interfaces;
+
+/**
+ * Home interface for SessionB.
+ */
+public interface SessionBHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/SessionB";
+   public static final String JNDI_NAME="eardeployment/SessionB";
+
+   public org.jboss.test.jmx.eardeployment.b.interfaces.SessionB create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionBLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionBLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionBLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,22 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardeployment.b.interfaces;
+
+/**
+ * Local interface for SessionB.
+ */
+public interface SessionBLocal
+   extends javax.ejb.EJBLocalObject
+{
+   /**
+    * Describe <code>callA</code> method here.
+    */
+   public boolean callA(  ) ;
+
+   /**
+    * Describe <code>doNothing</code> method here.
+    */
+   public void doNothing(  ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionBLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionBLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/eardeployment/b/interfaces/SessionBLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.eardeployment.b.interfaces;
+
+/**
+ * Local home interface for SessionB.
+ */
+public interface SessionBLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/SessionBLocal";
+   public static final String JNDI_NAME="eardeployment/LocalSessionB";
+
+   public org.jboss.test.jmx.eardeployment.b.interfaces.SessionBLocal create()
+      throws javax.ejb.CreateException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityA.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityA.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityA.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,40 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.interfaces;
+
+/**
+ * Remote interface for EntityA.
+ */
+public interface EntityA
+   extends javax.ejb.EJBObject
+{
+   /**
+    * Abstract cmp2 field get-set pair for field id Get the value of id
+    * @return value of id
+    */
+   public java.lang.Integer getId(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Set the value of id
+    * @param id Value to assign to id
+    */
+   public void setId( java.lang.Integer id )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Abstract cmp2 field get-set pair for field value Get the value of value
+    * @return value of value
+    */
+   public java.lang.String getValue(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Set the value of value
+    * @param value Value to assign to value
+    */
+   public void setValue( java.lang.String value )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityAHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityAHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityAHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.interfaces;
+
+/**
+ * Home interface for EntityA.
+ */
+public interface EntityAHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/EntityA";
+   public static final String JNDI_NAME="EntityA";
+
+   public java.util.Collection findAll()
+      throws javax.ejb.FinderException,java.rmi.RemoteException;
+
+   public org.jboss.test.jmx.interfaces.EntityA findByPrimaryKey(java.lang.Integer pk)
+      throws javax.ejb.FinderException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityB.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityB.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityB.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,40 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.interfaces;
+
+/**
+ * Remote interface for EntityB.
+ */
+public interface EntityB
+   extends javax.ejb.EJBObject
+{
+   /**
+    * Abstract cmp2 field get-set pair for field id Get the value of id
+    * @return value of id
+    */
+   public java.lang.Integer getId(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Set the value of id
+    * @param id Value to assign to id
+    */
+   public void setId( java.lang.Integer id )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Abstract cmp2 field get-set pair for field value Get the value of value
+    * @return value of value
+    */
+   public java.lang.String getValue(  )
+      throws java.rmi.RemoteException;
+
+   /**
+    * Set the value of value
+    * @param value Value to assign to value
+    */
+   public void setValue( java.lang.String value )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityBHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityBHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/interfaces/EntityBHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.interfaces;
+
+/**
+ * Home interface for EntityB.
+ */
+public interface EntityBHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/EntityB";
+   public static final String JNDI_NAME="EntityB";
+
+   public java.util.Collection findAll()
+      throws javax.ejb.FinderException,java.rmi.RemoteException;
+
+   public org.jboss.test.jmx.interfaces.EntityB findByPrimaryKey(java.lang.Integer pk)
+      throws javax.ejb.FinderException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/invoker/InvokerTestMBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/invoker/InvokerTestMBean.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/invoker/InvokerTestMBean.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,34 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.jmx.invoker;
+
+/**
+ * MBean interface.
+ */
+public interface InvokerTestMBean {
+
+   //default object name
+   public static final javax.management.ObjectName OBJECT_NAME = org.jboss.mx.util.ObjectNameFactory.create("jboss.test:service=InvokerTest");
+
+  java.lang.String getSomething() ;
+
+  org.jboss.test.jmx.invoker.CustomClass getCustom() ;
+
+  void setCustom(org.jboss.test.jmx.invoker.CustomClass custom) ;
+
+  org.jboss.test.jmx.invoker.NonserializableClass getNonserializableClass() ;
+
+  void setNonserializableClass(org.jboss.test.jmx.invoker.NonserializableClass custom) ;
+
+  org.w3c.dom.Element getXml() ;
+
+  void setXml(org.w3c.dom.Element xml) ;
+
+  org.jboss.test.jmx.invoker.CustomClass doSomething(org.jboss.test.jmx.invoker.CustomClass custom) ;
+
+  org.jboss.test.jmx.invoker.CustomClass doSomething() ;
+
+  void stop() ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/loading/Concrete.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/loading/Concrete.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/loading/Concrete.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,13 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.loading;
+
+/**
+ * Remote interface for Concrete.
+ */
+public interface Concrete
+   extends javax.ejb.EJBObject
+{
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/loading/ConcreteHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/loading/ConcreteHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/loading/ConcreteHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,18 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.jmx.loading;
+
+/**
+ * Home interface for Concrete.
+ */
+public interface ConcreteHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/Concrete";
+   public static final String JNDI_NAME="loading/cpmanifest";
+
+   public org.jboss.test.jmx.loading.Concrete create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/mbean/TestMBClassLoaderMBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/mbean/TestMBClassLoaderMBean.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/mbean/TestMBClassLoaderMBean.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,20 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.jmx.mbean;
+
+/**
+ * MBean interface.
+ */
+public interface TestMBClassLoaderMBean {
+
+   //default object name
+   public static final javax.management.ObjectName OBJECT_NAME = org.jboss.mx.util.ObjectNameFactory.create("jboss.test:service=BrokenDeployer");
+
+   /**
+    * Describe <code>getClassLoader</code> method here.
+    * @return a <code>String</code> value
+    */
+  java.lang.String getClassLoader() ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/jmx/missingclass/MissingClassTestMBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/missingclass/MissingClassTestMBean.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/missingclass/MissingClassTestMBean.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,14 @@
+/*
+ * Generated file - Do not edit!
+ */
+package org.jboss.test.jmx.missingclass;
+
+/**
+ * MBean interface.
+ */
+public interface MissingClassTestMBean extends org.jboss.system.ServiceMBean {
+
+   //default object name
+   public static final javax.management.ObjectName OBJECT_NAME = org.jboss.mx.util.ObjectNameFactory.create("jboss.test:name=missingclasstest");
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTest.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTest.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,85 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.proxycompiler.beans.interfaces;
+
+/**
+ * Remote interface for ProxyCompilerTest.
+ */
+public interface ProxyCompilerTest
+   extends javax.ejb.EJBObject
+{
+
+   public java.lang.Integer getPk(  )
+      throws java.rmi.RemoteException;
+
+   public void setPk( java.lang.Integer pk )
+      throws java.rmi.RemoteException;
+
+   public boolean getBool(  )
+      throws java.rmi.RemoteException;
+
+   public void setBool( boolean arg )
+      throws java.rmi.RemoteException;
+
+   public byte getByte(  )
+      throws java.rmi.RemoteException;
+
+   public void setByte( byte arg )
+      throws java.rmi.RemoteException;
+
+   public char getChar(  )
+      throws java.rmi.RemoteException;
+
+   public void setChar( char arg )
+      throws java.rmi.RemoteException;
+
+   public double getDouble(  )
+      throws java.rmi.RemoteException;
+
+   public void setDouble( double arg )
+      throws java.rmi.RemoteException;
+
+   public float getFloat(  )
+      throws java.rmi.RemoteException;
+
+   public void setFloat( float arg )
+      throws java.rmi.RemoteException;
+
+   public int getInt(  )
+      throws java.rmi.RemoteException;
+
+   public void setInt( int arg )
+      throws java.rmi.RemoteException;
+
+   public long getLong(  )
+      throws java.rmi.RemoteException;
+
+   public void setLong( long arg )
+      throws java.rmi.RemoteException;
+
+   public short getShort(  )
+      throws java.rmi.RemoteException;
+
+   public void setShort( short arg )
+      throws java.rmi.RemoteException;
+
+   public java.lang.Object[] getObjectArray(  )
+      throws java.rmi.RemoteException;
+
+   public void setObjectArray( java.lang.Object[] arg )
+      throws java.rmi.RemoteException;
+
+   public int[] getIntArray(  )
+      throws java.rmi.RemoteException;
+
+   public void setIntArray( int[] arg )
+      throws java.rmi.RemoteException;
+
+   public boolean noArgsMethod(  )
+      throws java.rmi.RemoteException;
+
+   public java.lang.String complexSignatureMethod( int i,java.lang.Object ref,int[] ints,java.lang.Object[] objectRefs )
+      throws java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTestHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTestHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTestHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,24 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.proxycompiler.beans.interfaces;
+
+/**
+ * Home interface for ProxyCompilerTest.
+ */
+public interface ProxyCompilerTestHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ProxyCompilerTest";
+   public static final String JNDI_NAME="ProxyCompilerTest";
+
+   public org.jboss.test.proxycompiler.beans.interfaces.ProxyCompilerTest create(java.lang.Integer pk)
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+   public java.util.Collection findAll()
+      throws javax.ejb.FinderException,java.rmi.RemoteException;
+
+   public org.jboss.test.proxycompiler.beans.interfaces.ProxyCompilerTest findByPrimaryKey(java.lang.Integer pk)
+      throws javax.ejb.FinderException,java.rmi.RemoteException;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTestLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTestLocal.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTestLocal.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,61 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.proxycompiler.beans.interfaces;
+
+/**
+ * Local interface for ProxyCompilerTest.
+ */
+public interface ProxyCompilerTestLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public java.lang.Integer getPk(  ) ;
+
+   public void setPk( java.lang.Integer pk ) ;
+
+   public boolean getBool(  ) ;
+
+   public void setBool( boolean arg ) ;
+
+   public byte getByte(  ) ;
+
+   public void setByte( byte arg ) ;
+
+   public char getChar(  ) ;
+
+   public void setChar( char arg ) ;
+
+   public double getDouble(  ) ;
+
+   public void setDouble( double arg ) ;
+
+   public float getFloat(  ) ;
+
+   public void setFloat( float arg ) ;
+
+   public int getInt(  ) ;
+
+   public void setInt( int arg ) ;
+
+   public long getLong(  ) ;
+
+   public void setLong( long arg ) ;
+
+   public short getShort(  ) ;
+
+   public void setShort( short arg ) ;
+
+   public java.lang.Object[] getObjectArray(  ) ;
+
+   public void setObjectArray( java.lang.Object[] arg ) ;
+
+   public int[] getIntArray(  ) ;
+
+   public void setIntArray( int[] arg ) ;
+
+   public boolean noArgsMethod(  ) ;
+
+   public java.lang.String complexSignatureMethod( int i,java.lang.Object ref,int[] ints,java.lang.Object[] objectRefs ) ;
+
+}

Added: trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTestLocalHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTestLocalHome.java	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/main/org/jboss/test/proxycompiler/beans/interfaces/ProxyCompilerTestLocalHome.java	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,24 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.test.proxycompiler.beans.interfaces;
+
+/**
+ * Local home interface for ProxyCompilerTest.
+ */
+public interface ProxyCompilerTestLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/ProxyCompilerTestLocal";
+   public static final String JNDI_NAME="LocalProxyCompilerTest";
+
+   public org.jboss.test.proxycompiler.beans.interfaces.ProxyCompilerTestLocal create(java.lang.Integer pk)
+      throws javax.ejb.CreateException;
+
+   public java.util.Collection findAll()
+      throws javax.ejb.FinderException;
+
+   public org.jboss.test.proxycompiler.beans.interfaces.ProxyCompilerTestLocal findByPrimaryKey(java.lang.Integer pk)
+      throws javax.ejb.FinderException;
+
+}

Added: trunk/testsuite/src/resources/cmp2/ageout/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/ageout/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/ageout/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,216 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+         <session>
+         <description>JUnit Session Bean Test Runner</description>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
+         <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
+         <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Bean</transaction-type>
+      </session>
+
+      <!-- Entity Beans -->
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>B</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.ejbselect.BLocalHome</local-home>
+         <local>org.jboss.test.cmp2.ejbselect.BLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.ejbselect.BCMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.String</prim-key-class>
+         <reentrant>False</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>B</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>name</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>bool</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>longField</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+
+         <query>
+            <description><![CDATA[]]></description>
+            <query-method>
+               <method-name>ejbSelectTrue</method-name>
+               <method-params>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[SELECT OBJECT(b) FROM B AS b WHERE b.bool = TRUE]]></ejb-ql>
+         </query>
+         <query>
+            <description><![CDATA[]]></description>
+            <query-method>
+               <method-name>ejbSelectFalse</method-name>
+               <method-params>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[SELECT OBJECT(b) FROM B AS b WHERE b.bool = FALSE]]></ejb-ql>
+         </query>
+         <query>
+            <description><![CDATA[Dynamic QL]]></description>
+            <query-method>
+               <method-name>ejbSelectDynamic</method-name>
+               <method-params>
+                  <method-param>java.lang.String</method-param>
+                  <method-param>java.lang.Object[]</method-param>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[]]></ejb-ql>
+         </query>
+	  <!-- Write a file named ejb-finders-BBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>A</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.ejbselect.ALocalHome</local-home>
+         <local>org.jboss.test.cmp2.ejbselect.ALocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.ejbselect.ACMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.String</prim-key-class>
+         <reentrant>False</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>A</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>intField</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+
+         <query>
+            <description><![CDATA[]]></description>
+            <query-method>
+               <method-name>ejbSelectSomeBs</method-name>
+               <method-params>
+                  <method-param>org.jboss.test.cmp2.ejbselect.ALocal</method-param>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[SELECT OBJECT(b) FROM B AS b WHERE b.a = ?1]]></ejb-ql>
+         </query>
+         <query>
+            <description><![CDATA[]]></description>
+            <query-method>
+               <method-name>ejbSelectAWithBs</method-name>
+               <method-params>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[SELECT DISTINCT OBJECT(a) FROM A AS a WHERE a.bs IS NOT EMPTY]]></ejb-ql>
+         </query>
+         <query>
+            <description><![CDATA[Declared SQL]]></description>
+            <query-method>
+               <method-name>ejbSelectSomeBsDeclaredSQL</method-name>
+               <method-params>
+                  <method-param>org.jboss.test.cmp2.ejbselect.ALocal</method-param>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[]]></ejb-ql>
+         </query>
+         <query>
+            <description><![CDATA[NOTE: -1234 does not exist]]></description>
+            <query-method>
+               <method-name>ejbSelectNullSum</method-name>
+               <method-params>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[SELECT SUM(a.intField) FROM A AS a WHERE a.intField = -1234]]></ejb-ql>
+         </query>
+	  <!-- Write a file named ejb-finders-ABean.xml if you want to define extra finders. -->
+      </entity>
+
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+   <relationships >
+      <ejb-relation >
+         <ejb-relation-name>A-B</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>B-has-an-A</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <cascade-delete/>
+            <relationship-role-source >
+               <ejb-name>B</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>a</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>A-has-Bs</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>A</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>bs</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+   </relationships>
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/cmp2/ageout/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/ageout/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/ageout/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_2.dtd">
+
+<jbosscmp-jdbc>
+   <defaults>
+   </defaults>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jbosscmp-jdbc-beans.xml
+       that contains the <entity></entity> markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>B</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>TEST_B</table-name>
+
+         <cmp-field>
+            <field-name>id</field-name>
+            <column-name>ID</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>name</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>bool</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>longField</field-name>
+
+        </cmp-field>
+
+         <query>
+            <query-method>
+               <method-name>ejbSelectDynamic</method-name>
+               <method-params>
+                  <method-param>java.lang.String</method-param>
+                  <method-param>java.lang.Object[]</method-param>
+               </method-params>
+            </query-method>
+			<dynamic-ql/>
+
+	     </query>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+      <entity>
+         <ejb-name>A</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>TEST_A</table-name>
+
+         <cmp-field>
+            <field-name>id</field-name>
+            <column-name>ID</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>intField</field-name>
+            <column-name>INT_FIELD</column-name>
+
+        </cmp-field>
+
+         <query>
+			<description/>
+            <query-method>
+               <method-name>ejbSelectSomeBsDeclaredSQL</method-name>
+               <method-params>
+                  <method-param>org.jboss.test.cmp2.ejbselect.ALocal</method-param>
+               </method-params>
+            </query-method>
+
+            <declared-sql>
+                <select>
+                   <ejb-name><![CDATA[B]]></ejb-name>
+
+                   <alias><![CDATA[b]]></alias>
+                </select>
+                <from><![CDATA[, TEST_A a]]></from>
+                <where><![CDATA[a.ID={0.id} AND b.A_ID=a.ID]]></where>
+            </declared-sql>
+         </query>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+   </enterprise-beans>
+
+  <relationships>
+    <ejb-relation>
+      <ejb-relation-name>A-B</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>B-has-an-A</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>A-has-Bs</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>id</field-name>
+               <column-name>A_ID</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+  </relationships>
+
+</jbosscmp-jdbc>

Added: trunk/testsuite/src/resources/cmp2/cmr/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/cmr/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/cmr/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,274 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+      <session >
+         <description><![CDATA[Describe class <code>CMRBugManagerBean</code> here.]]></description>
+
+         <ejb-name>CMRBugManagerEJB</ejb-name>
+
+         <home>org.jboss.test.cmp2.cmr.interfaces.CMRBugManagerEJBHome</home>
+         <remote>org.jboss.test.cmp2.cmr.interfaces.CMRBugManagerEJB</remote>
+         <local-home>org.jboss.test.cmp2.cmr.interfaces.CMRBugManagerEJBLocalHome</local-home>
+         <local>org.jboss.test.cmp2.cmr.interfaces.CMRBugManagerEJBLocal</local>
+         <ejb-class>org.jboss.test.cmp2.cmr.ejb.CMRBugManagerBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+         <ejb-local-ref >
+            <ejb-ref-name>ejb/CMRBug</ejb-ref-name>
+            <ejb-ref-type>Entity</ejb-ref-type>
+            <local-home>org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocalHome</local-home>
+            <local>org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal</local>
+            <ejb-link>CMRBugEJB</ejb-link>
+         </ejb-local-ref>
+
+      </session>
+
+     <!--
+       To add session beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called session-beans.xml that contains
+       the <session></session> markup for those beans.
+     -->
+
+      <!-- Entity Beans -->
+      <entity >
+         <description><![CDATA[class <code>CMRBugBean</code> demonstrates bug 523627.]]></description>
+
+         <ejb-name>CMRBugEJB</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocalHome</local-home>
+         <local>org.jboss.test.cmp2.cmr.interfaces.CMRBugEJBLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.cmr.ejb.CMRBugBean</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.String</prim-key-class>
+         <reentrant>true</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>CMRBug</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[Describe <code>getId</code> method here.]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[Describe <code>getDescription</code> method here.]]></description>
+            <field-name>description</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+
+         <query>
+            <query-method>
+               <method-name>findAll</method-name>
+               <method-params>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[select object(cmr_bug) from CMRBug as cmr_bug]]></ejb-ql>
+         </query>
+	  <!-- Write a file named ejb-finders-CMRBugBean.xml if you want to define extra finders. -->
+      </entity>
+
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+   <relationships >
+      <ejb-relation >
+         <ejb-relation-name>viewcomponent-nextnode</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>one-viewcomponent-has-one-following-node</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>CMRBugEJB</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>nextNode</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>one-following-node-belogs-to-one-viewcomponent</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>CMRBugEJB</ejb-name>
+            </relationship-role-source>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+      <ejb-relation >
+         <ejb-relation-name>CMRBug-CMRBug</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>parent</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <cascade-delete/>
+            <relationship-role-source >
+               <ejb-name>CMRBugEJB</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>parent</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>children</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>CMRBugEJB</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>children</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+      <ejb-relation >
+         <ejb-relation-name>viewcomponent-prevnode</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>one-viewcomponent-has-one-previous-node</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>CMRBugEJB</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>prevNode</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>one-prev-belogs-to-one-viewcomponent</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>CMRBugEJB</ejb-name>
+            </relationship-role-source>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+   </relationships>
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+   <container-transaction >
+      <method >
+         <ejb-name>CMRBugManagerEJB</ejb-name>
+          <method-name>*</method-name>
+       </method>
+       <trans-attribute>Required</trans-attribute>
+    </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>CMRBugManagerEJB</ejb-name>
+         <method-intf>Local</method-intf>
+         <method-name>setupLoadFKState</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>CMRBugManagerEJB</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>setupLoadFKState</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>CMRBugManagerEJB</ejb-name>
+         <method-intf>Local</method-intf>
+         <method-name>moveLastNodeBack</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>CMRBugManagerEJB</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>moveLastNodeBack</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>CMRBugManagerEJB</ejb-name>
+         <method-intf>Local</method-intf>
+         <method-name>lastHasNextNode</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>CMRBugManagerEJB</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>lastHasNextNode</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>CMRBugManagerEJB</ejb-name>
+         <method-intf>Local</method-intf>
+         <method-name>tearDownLoadFKState</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>CMRBugManagerEJB</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>tearDownLoadFKState</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/cmp2/cmr/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/cmr/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/cmr/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jboss-beans.xml that contains
+       the <session></session>, <entity></entity> and <message-driven></message-driven>
+       markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>CMRBugEJB</ejb-name>
+         <local-jndi-name>LocalReadOnly</local-jndi-name>
+
+      </entity>
+
+      <session>
+         <ejb-name>CMRBugManagerEJB</ejb-name>
+         <jndi-name>CMRBugManager</jndi-name>
+         <local-jndi-name>CMRBugManagerEJBLocal</local-jndi-name>
+
+      </session>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+</jboss>

Added: trunk/testsuite/src/resources/cmp2/cmr/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/cmr/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/cmr/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.0//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_0.dtd">
+
+<jbosscmp-jdbc>
+   <defaults>
+     <datasource>java:/DefaultDS</datasource>
+     <datasource-mapping>Hypersonic SQL</datasource-mapping>
+   </defaults>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jbosscmp-jdbc-beans.xml
+       that contains the <entity></entity> markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>CMRBugEJB</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+
+         <cmp-field>
+            <field-name>id</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>description</field-name>
+
+        </cmp-field>
+
+      </entity>
+
+   </enterprise-beans>
+
+  <relationships>
+    <ejb-relation>
+      <ejb-relation-name>viewcomponent-nextnode</ejb-relation-name>
+
+      <foreign-key-mapping/>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>one-viewcomponent-has-one-following-node</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>one-following-node-belogs-to-one-viewcomponent</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>id</field-name>
+               <column-name>next_id_fk</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+    <ejb-relation>
+      <ejb-relation-name>CMRBug-CMRBug</ejb-relation-name>
+
+      <foreign-key-mapping/>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>parent</ejb-relationship-role-name>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>children</ejb-relationship-role-name>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+    <ejb-relation>
+      <ejb-relation-name>viewcomponent-prevnode</ejb-relation-name>
+
+      <foreign-key-mapping/>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>one-viewcomponent-has-one-previous-node</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>one-prev-belogs-to-one-viewcomponent</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>id</field-name>
+               <column-name>prev_id_fk</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+  </relationships>
+
+</jbosscmp-jdbc>

Added: trunk/testsuite/src/resources/cmp2/cmrstress/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/cmrstress/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/cmrstress/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,284 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+     <!--
+       To add session beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called session-beans.xml that contains
+       the <session></session> markup for those beans.
+     -->
+
+      <!-- Entity Beans -->
+      <entity >
+         <description><![CDATA[The problem child.]]></description>
+
+         <ejb-name>Child</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.cmrstress.interfaces.ChildLocalHome</local-home>
+         <local>org.jboss.test.cmp2.cmrstress.interfaces.ChildLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.cmrstress.ejb.ChildBean</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.String</prim-key-class>
+         <reentrant>False</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>Child</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[CMP get method for Id attribute.]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[CMP get method for Name attribute.]]></description>
+            <field-name>name</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[CMP get method for Value attribute.]]></description>
+            <field-name>value</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+
+	  <!-- Write a file named ejb-finders-ChildBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[This class implements the "parent" side of 1..many unidirectional relationship.]]></description>
+
+         <ejb-name>Parent</ejb-name>
+
+         <home>org.jboss.test.cmp2.cmrstress.interfaces.ParentHome</home>
+         <remote>org.jboss.test.cmp2.cmrstress.interfaces.Parent</remote>
+         <local-home>org.jboss.test.cmp2.cmrstress.interfaces.ParentLocalHome</local-home>
+         <local>org.jboss.test.cmp2.cmrstress.interfaces.ParentLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.cmrstress.ejb.ParentBean</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.String</prim-key-class>
+         <reentrant>False</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>Parent</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[CMP get method for Id attribute.]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+
+         <ejb-local-ref >
+            <ejb-ref-name>ejb/Child</ejb-ref-name>
+            <ejb-ref-type>Entity</ejb-ref-type>
+            <local-home>org.jboss.test.cmp2.cmrstress.interfaces.ChildLocalHome</local-home>
+            <local>org.jboss.test.cmp2.cmrstress.interfaces.ChildLocal</local>
+            <ejb-link>Child</ejb-link>
+         </ejb-local-ref>
+
+	  <!-- Write a file named ejb-finders-ParentBean.xml if you want to define extra finders. -->
+      </entity>
+
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+   <relationships >
+      <ejb-relation >
+         <ejb-relation-name>Parent-Child</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Parent-has-Children</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Parent</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>children</cmr-field-name>
+               <cmr-field-type>java.util.Set</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Child-of-Parent</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <cascade-delete/>
+            <relationship-role-source >
+               <ejb-name>Child</ejb-name>
+            </relationship-role-source>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+   </relationships>
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+   <container-transaction >
+      <method >
+         <ejb-name>Child</ejb-name>
+          <method-name>*</method-name>
+       </method>
+       <trans-attribute>Supports</trans-attribute>
+    </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Child</ejb-name>
+         <method-intf>Local</method-intf>
+         <method-name>setId</method-name>
+         <method-params>
+            <method-param>java.lang.String</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>Mandatory</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Child</ejb-name>
+         <method-intf>Local</method-intf>
+         <method-name>setName</method-name>
+         <method-params>
+            <method-param>java.lang.String</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>Mandatory</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Child</ejb-name>
+         <method-intf>Local</method-intf>
+         <method-name>setValue</method-name>
+         <method-params>
+            <method-param>java.lang.String</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>Mandatory</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Child</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-param>java.lang.String</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>Mandatory</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Child</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-param>java.lang.String</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>Mandatory</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Parent</ejb-name>
+          <method-name>*</method-name>
+       </method>
+       <trans-attribute>Supports</trans-attribute>
+    </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Parent</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>setId</method-name>
+         <method-params>
+            <method-param>java.lang.String</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>Mandatory</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Parent</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>setChildren</method-name>
+         <method-params>
+            <method-param>java.util.Set</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>Mandatory</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Parent</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>getPropertyMap</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>Required</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Parent</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>addChild</method-name>
+         <method-params>
+            <method-param>int</method-param>
+            <method-param>java.lang.String</method-param>
+            <method-param>java.lang.String</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Parent</ejb-name>
+         <method-intf>LocalHome</method-intf>
+         <method-name>create</method-name>
+         <method-params>
+            <method-param>java.lang.String</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Parent</ejb-name>
+         <method-intf>Home</method-intf>
+         <method-name>create</method-name>
+         <method-params>
+            <method-param>java.lang.String</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/cmp2/cmrstress/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/cmrstress/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/cmrstress/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jboss-beans.xml that contains
+       the <session></session>, <entity></entity> and <message-driven></message-driven>
+       markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>Child</ejb-name>
+         <local-jndi-name>ChildLocal</local-jndi-name>
+
+      </entity>
+      <entity>
+         <ejb-name>Parent</ejb-name>
+         <jndi-name>cmrstress/Parent</jndi-name>
+         <local-jndi-name>ParentLocal</local-jndi-name>
+
+      </entity>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+</jboss>

Added: trunk/testsuite/src/resources/cmp2/cmrstress/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/cmrstress/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/cmrstress/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.0//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_0.dtd">
+
+<jbosscmp-jdbc>
+   <defaults>
+     <datasource>java:/DefaultDS</datasource>
+     <datasource-mapping>Hypersonic SQL</datasource-mapping>
+   </defaults>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jbosscmp-jdbc-beans.xml
+       that contains the <entity></entity> markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>Child</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>StressedChild</table-name>
+
+         <cmp-field>
+            <field-name>id</field-name>
+            <column-name>id</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>name</field-name>
+            <column-name>name</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>value</field-name>
+            <column-name>value</column-name>
+
+        </cmp-field>
+
+      </entity>
+
+      <entity>
+         <ejb-name>Parent</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>StressedParent</table-name>
+
+         <cmp-field>
+            <field-name>id</field-name>
+            <column-name>id</column-name>
+
+        </cmp-field>
+
+      </entity>
+
+   </enterprise-beans>
+
+  <relationships>
+    <ejb-relation>
+      <ejb-relation-name>Parent-Child</ejb-relation-name>
+
+      <foreign-key-mapping/>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Parent-has-Children</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>id</field-name>
+               <column-name>parentid</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Child-of-Parent</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+  </relationships>
+
+</jbosscmp-jdbc>

Added: trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,280 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+      <session >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>Facade</ejb-name>
+
+         <home>org.jboss.test.cmp2.cmrtree.ejb.FacadeHome</home>
+         <remote>org.jboss.test.cmp2.cmrtree.ejb.Facade</remote>
+         <ejb-class>org.jboss.test.cmp2.cmrtree.ejb.FacadeSessionBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+      </session>
+
+         <session>
+         <description>JUnit Session Bean Test Runner</description>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
+         <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
+         <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Bean</transaction-type>
+      </session>
+
+      <!-- Entity Beans -->
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>B</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.cmrtree.ejb.BLocalHome</local-home>
+         <local>org.jboss.test.cmp2.cmrtree.ejb.BLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.cmrtree.ejb.BBean</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>org.jboss.test.cmp2.cmrtree.ejb.BPK</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>B</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>majorId</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>minorId</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>name</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>AMinorId</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>parentBMinorId</field-name>
+         </cmp-field>
+
+	  <!-- Write a file named ejb-finders-BBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>A</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.cmrtree.ejb.ALocalHome</local-home>
+         <local>org.jboss.test.cmp2.cmrtree.ejb.ALocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.cmrtree.ejb.ABean</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>org.jboss.test.cmp2.cmrtree.ejb.APK</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>A</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>majorId</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>minorId</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>name</field-name>
+         </cmp-field>
+
+	  <!-- Write a file named ejb-finders-ABean.xml if you want to define extra finders. -->
+      </entity>
+
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+   <relationships >
+      <ejb-relation >
+         <ejb-relation-name>B-Children</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>child-has-Parent</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <cascade-delete/>
+            <relationship-role-source >
+               <ejb-name>B</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>parent</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>B-has-children</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>B</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>children</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+      <ejb-relation >
+         <ejb-relation-name>A-B</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>B-has-A</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <cascade-delete/>
+            <relationship-role-source >
+               <ejb-name>B</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>a</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>A-has-B</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>A</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>b</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+   </relationships>
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+   <container-transaction >
+      <method >
+         <ejb-name>B</ejb-name>
+          <method-name>*</method-name>
+       </method>
+       <trans-attribute>Required</trans-attribute>
+    </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>A</ejb-name>
+          <method-name>*</method-name>
+       </method>
+       <trans-attribute>Required</trans-attribute>
+    </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Facade</ejb-name>
+          <method-name>*</method-name>
+       </method>
+       <trans-attribute>Required</trans-attribute>
+    </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Facade</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>setup</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Facade</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>test</method-name>
+         <method-params>
+            <method-param>long</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Facade</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>tearDown</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Facade</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>setup2</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Facade</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>setBNameToNull</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Facade</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>getBName</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+        <session>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <jndi-name>ejb/EJBTestRunner</jndi-name>
+      </session>
+
+      <entity>
+         <ejb-name>B</ejb-name>
+         <local-jndi-name>BLocal</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+      <entity>
+         <ejb-name>A</ejb-name>
+         <local-jndi-name>ALocal</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+
+      <session>
+         <ejb-name>Facade</ejb-name>
+         <jndi-name>Facade</jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+      </session>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+</jboss>

Added: trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/cmrtree/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_2.dtd">
+
+<jbosscmp-jdbc>
+   <defaults>
+     <preferred-relation-mapping>foreign-key</preferred-relation-mapping>
+   </defaults>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jbosscmp-jdbc-beans.xml
+       that contains the <entity></entity> markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>B</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>CMRTREEB</table-name>
+
+         <cmp-field>
+            <field-name>majorId</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>minorId</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>name</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>AMinorId</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>parentBMinorId</field-name>
+
+        </cmp-field>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+      <entity>
+         <ejb-name>A</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>CMRTREEA</table-name>
+
+         <cmp-field>
+            <field-name>majorId</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>minorId</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>name</field-name>
+
+        </cmp-field>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+   </enterprise-beans>
+
+  <relationships>
+    <ejb-relation>
+      <ejb-relation-name>B-Children</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>child-has-Parent</ejb-relationship-role-name>
+          <fk-constraint>false</fk-constraint>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>B-has-children</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>majorId</field-name>
+               <column-name>majorId</column-name>
+             </key-field>
+             <key-field>
+               <field-name>minorId</field-name>
+               <column-name>parentBMinorId</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+    <ejb-relation>
+      <ejb-relation-name>A-B</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>B-has-A</ejb-relationship-role-name>
+          <fk-constraint>false</fk-constraint>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>A-has-B</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>majorId</field-name>
+               <column-name>majorId</column-name>
+             </key-field>
+             <key-field>
+               <field-name>minorId</field-name>
+               <column-name>AMinorId</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+  </relationships>
+
+</jbosscmp-jdbc>

Added: trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,216 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+         <session>
+         <description>JUnit Session Bean Test Runner</description>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
+         <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
+         <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Bean</transaction-type>
+      </session>
+
+      <!-- Entity Beans -->
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>B</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.ejbselect.BLocalHome</local-home>
+         <local>org.jboss.test.cmp2.ejbselect.BLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.ejbselect.BCMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.String</prim-key-class>
+         <reentrant>False</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>B</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>name</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>bool</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>longField</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+
+         <query>
+            <description><![CDATA[]]></description>
+            <query-method>
+               <method-name>ejbSelectTrue</method-name>
+               <method-params>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[SELECT OBJECT(b) FROM B AS b WHERE b.bool = TRUE]]></ejb-ql>
+         </query>
+         <query>
+            <description><![CDATA[]]></description>
+            <query-method>
+               <method-name>ejbSelectFalse</method-name>
+               <method-params>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[SELECT OBJECT(b) FROM B AS b WHERE b.bool = FALSE]]></ejb-ql>
+         </query>
+         <query>
+            <description><![CDATA[Dynamic QL]]></description>
+            <query-method>
+               <method-name>ejbSelectDynamic</method-name>
+               <method-params>
+                  <method-param>java.lang.String</method-param>
+                  <method-param>java.lang.Object[]</method-param>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[]]></ejb-ql>
+         </query>
+	  <!-- Write a file named ejb-finders-BBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>A</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.ejbselect.ALocalHome</local-home>
+         <local>org.jboss.test.cmp2.ejbselect.ALocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.ejbselect.ACMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.String</prim-key-class>
+         <reentrant>False</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>A</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>intField</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+
+         <query>
+            <description><![CDATA[]]></description>
+            <query-method>
+               <method-name>ejbSelectSomeBs</method-name>
+               <method-params>
+                  <method-param>org.jboss.test.cmp2.ejbselect.ALocal</method-param>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[SELECT OBJECT(b) FROM B AS b WHERE b.a = ?1]]></ejb-ql>
+         </query>
+         <query>
+            <description><![CDATA[]]></description>
+            <query-method>
+               <method-name>ejbSelectAWithBs</method-name>
+               <method-params>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[SELECT DISTINCT OBJECT(a) FROM A AS a WHERE a.bs IS NOT EMPTY]]></ejb-ql>
+         </query>
+         <query>
+            <description><![CDATA[Declared SQL]]></description>
+            <query-method>
+               <method-name>ejbSelectSomeBsDeclaredSQL</method-name>
+               <method-params>
+                  <method-param>org.jboss.test.cmp2.ejbselect.ALocal</method-param>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[]]></ejb-ql>
+         </query>
+         <query>
+            <description><![CDATA[NOTE: -1234 does not exist]]></description>
+            <query-method>
+               <method-name>ejbSelectNullSum</method-name>
+               <method-params>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[SELECT SUM(a.intField) FROM A AS a WHERE a.intField = -1234]]></ejb-ql>
+         </query>
+	  <!-- Write a file named ejb-finders-ABean.xml if you want to define extra finders. -->
+      </entity>
+
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+   <relationships >
+      <ejb-relation >
+         <ejb-relation-name>A-B</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>B-has-an-A</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <cascade-delete/>
+            <relationship-role-source >
+               <ejb-name>B</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>a</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>A-has-Bs</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>A</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>bs</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+   </relationships>
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+        <session>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <jndi-name>ejb/EJBTestRunner</jndi-name>
+      </session>
+
+      <entity>
+         <ejb-name>B</ejb-name>
+         <local-jndi-name>BLocal</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+      <entity>
+         <ejb-name>A</ejb-name>
+         <local-jndi-name>ALocal</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+</jboss>

Added: trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_2.dtd">
+
+<jbosscmp-jdbc>
+   <defaults>
+   </defaults>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jbosscmp-jdbc-beans.xml
+       that contains the <entity></entity> markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>B</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>TEST_B</table-name>
+
+         <cmp-field>
+            <field-name>id</field-name>
+            <column-name>ID</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>name</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>bool</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>longField</field-name>
+
+        </cmp-field>
+
+         <query>
+            <query-method>
+               <method-name>ejbSelectDynamic</method-name>
+               <method-params>
+                  <method-param>java.lang.String</method-param>
+                  <method-param>java.lang.Object[]</method-param>
+               </method-params>
+            </query-method>
+			<dynamic-ql/>
+
+	     </query>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+      <entity>
+         <ejb-name>A</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>TEST_A</table-name>
+
+         <cmp-field>
+            <field-name>id</field-name>
+            <column-name>ID</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>intField</field-name>
+            <column-name>INT_FIELD</column-name>
+
+        </cmp-field>
+
+         <query>
+			<description/>
+            <query-method>
+               <method-name>ejbSelectSomeBsDeclaredSQL</method-name>
+               <method-params>
+                  <method-param>org.jboss.test.cmp2.ejbselect.ALocal</method-param>
+               </method-params>
+            </query-method>
+
+            <declared-sql>
+                <select>
+                   <ejb-name><![CDATA[B]]></ejb-name>
+
+                   <alias><![CDATA[b]]></alias>
+                </select>
+                <from><![CDATA[, TEST_A a]]></from>
+                <where><![CDATA[a.ID={0.id} AND b.A_ID=a.ID]]></where>
+            </declared-sql>
+         </query>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+   </enterprise-beans>
+
+  <relationships>
+    <ejb-relation>
+      <ejb-relation-name>A-B</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>B-has-an-A</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>A-has-Bs</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>id</field-name>
+               <column-name>A_ID</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+  </relationships>
+
+</jbosscmp-jdbc>

Added: trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/original-jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/original-jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/original-jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+        <session>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <jndi-name>ejb/EJBTestRunner</jndi-name>
+      </session>
+
+      <entity>
+         <ejb-name>B</ejb-name>
+         <local-jndi-name>BLocal</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+      <entity>
+         <ejb-name>A</ejb-name>
+         <local-jndi-name>ALocal</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+</jboss>

Added: trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,643 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+      <session >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>Manager</ejb-name>
+
+         <home>org.jboss.test.cmp2.fkmapping.ejb.ManagerHome</home>
+         <remote>org.jboss.test.cmp2.fkmapping.ejb.Manager</remote>
+         <ejb-class>org.jboss.test.cmp2.fkmapping.ejb.ManagerSession</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+      </session>
+
+         <session>
+         <description>JUnit Session Bean Test Runner</description>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
+         <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
+         <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Bean</transaction-type>
+      </session>
+
+      <!-- Entity Beans -->
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>Student</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.fkmapping.ejb.StudentLocalHome</local-home>
+         <local>org.jboss.test.cmp2.fkmapping.ejb.StudentLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.fkmapping.ejb.StudentCMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>org.jboss.test.cmp2.fkmapping.ejb.StudentPK</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>Student</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>departmentCode</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>departmentCode2</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>lastName</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>description</field-name>
+         </cmp-field>
+
+	  <!-- Write a file named ejb-finders-StudentEntityBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>Institute</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.fkmapping.ejb.InstituteLocalHome</local-home>
+         <local>org.jboss.test.cmp2.fkmapping.ejb.InstituteLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.fkmapping.ejb.InstituteCMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>org.jboss.test.cmp2.fkmapping.ejb.InstitutePK</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>Institute</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>instituteId</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>description</field-name>
+         </cmp-field>
+
+	  <!-- Write a file named ejb-finders-InstituteEntityBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>ChildUPK</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.fkmapping.ejb.ChildUPKLocalHome</local-home>
+         <local>org.jboss.test.cmp2.fkmapping.ejb.ChildUPKLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.fkmapping.ejb.ChildUPKCMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.Object</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>ChildUPK</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>firstName</field-name>
+         </cmp-field>
+
+	  <!-- Write a file named ejb-finders-ChildCMPUnknownPKBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>Examenation</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.fkmapping.ejb.ExamenationLocalHome</local-home>
+         <local>org.jboss.test.cmp2.fkmapping.ejb.ExamenationLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.fkmapping.ejb.ExamenationCMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>org.jboss.test.cmp2.fkmapping.ejb.ExamenationPK</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>Examenation</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>examId</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>subject</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>departmentCode</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>departmentCode2</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>groupNumber</field-name>
+         </cmp-field>
+
+	  <!-- Write a file named ejb-finders-ExamenationEntityBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>Child</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.fkmapping.ejb.ChildLocalHome</local-home>
+         <local>org.jboss.test.cmp2.fkmapping.ejb.ChildLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.fkmapping.ejb.ChildCMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.Long</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>Child</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>firstName</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[Non-null CMP field mapped to the foreign key field Used as a read-only field to verify correctness of INSERT]]></description>
+            <field-name>motherId</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[Non-null CMP field mapped to the foreign key field Used as a read-only field to verify correctness of INSERT]]></description>
+            <field-name>motherName</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+
+	  <!-- Write a file named ejb-finders-ChildCMPBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>Parent</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.fkmapping.ejb.ParentLocalHome</local-home>
+         <local>org.jboss.test.cmp2.fkmapping.ejb.ParentLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.fkmapping.ejb.ParentCMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>org.jboss.test.cmp2.fkmapping.ejb.ParentPK</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>Parent</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>firstName</field-name>
+         </cmp-field>
+
+	  <!-- Write a file named ejb-finders-ParentCMPBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>Department</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocalHome</local-home>
+         <local>org.jboss.test.cmp2.fkmapping.ejb.DepartmentLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.fkmapping.ejb.DepartmentCMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>org.jboss.test.cmp2.fkmapping.ejb.DepartmentPK</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>Department</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>departmentCode</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>departmentCode2</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>description</field-name>
+         </cmp-field>
+
+	  <!-- Write a file named ejb-finders-DepartmentEntityBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>Group</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.fkmapping.ejb.GroupLocalHome</local-home>
+         <local>org.jboss.test.cmp2.fkmapping.ejb.GroupLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.fkmapping.ejb.GroupCMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>org.jboss.test.cmp2.fkmapping.ejb.GroupPK</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>Group</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>departmentCode</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>departmentCode2</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>groupNumber</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>description</field-name>
+         </cmp-field>
+
+         <query>
+            <query-method>
+               <method-name>findAll</method-name>
+               <method-params>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[SELECT OBJECT(g) FROM Group g]]></ejb-ql>
+         </query>
+	  <!-- Write a file named ejb-finders-GroupEntityBean.xml if you want to define extra finders. -->
+      </entity>
+
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+   <relationships >
+      <ejb-relation >
+         <ejb-relation-name>Institute-Department-StandaloneFK</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Department-has-Institute</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Department</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>institute</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Institute-has-Departments</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Institute</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>departments</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+      <ejb-relation >
+         <ejb-relation-name>Group-Student-PartialFKToPK</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Student-has-Group</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Student</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>group</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Group-has-Students</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Group</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>students</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+      <ejb-relation >
+         <ejb-relation-name>Department-Student-CompleteFKToPK</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Student-has-Department</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Student</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>department</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Department-has-Students</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Department</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>students</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+      <ejb-relation >
+         <ejb-relation-name>Mother-Child</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Child-has-Mother</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Child</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>mother</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Mother-has-Child</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Parent</ejb-name>
+            </relationship-role-source>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+      <ejb-relation >
+         <ejb-relation-name>Group-Exam-FKToCMP</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Exam-has-Group</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Examenation</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>group</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Group-has-Exams</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Group</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>examenations</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+      <ejb-relation >
+         <ejb-relation-name>Department-Group-CompleteFKToPK</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Group-has-Department</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Group</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>department</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Department-has-Groups</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Department</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>groups</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+      <ejb-relation >
+         <ejb-relation-name>Mother-Child-upk</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Child-has-Mother</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <relationship-role-source >
+               <ejb-name>ChildUPK</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>mother</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Mother-has-Child</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Parent</ejb-name>
+            </relationship-role-source>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+      <ejb-relation >
+         <ejb-relation-name>Father-Child-upk</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Child-has-Father</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <relationship-role-source >
+               <ejb-name>ChildUPK</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>father</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>Father-has-Child</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Parent</ejb-name>
+            </relationship-role-source>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+   </relationships>
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+   <container-transaction >
+      <method >
+         <ejb-name>Manager</ejb-name>
+          <method-name>*</method-name>
+       </method>
+       <trans-attribute>Required</trans-attribute>
+    </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Manager</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>createParent</method-name>
+         <method-params>
+            <method-param>java.lang.Long</method-param>
+            <method-param>java.lang.String</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Manager</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>createChild</method-name>
+         <method-params>
+            <method-param>java.lang.Long</method-param>
+            <method-param>java.lang.String</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Manager</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>createChild</method-name>
+         <method-params>
+            <method-param>java.lang.Long</method-param>
+            <method-param>java.lang.String</method-param>
+            <method-param>java.lang.Long</method-param>
+            <method-param>java.lang.String</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Manager</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>assertChildHasMother</method-name>
+         <method-params>
+            <method-param>java.lang.Long</method-param>
+            <method-param>java.lang.Long</method-param>
+            <method-param>java.lang.String</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Manager</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>createChildUPKWithMother</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Manager</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>loadChildUPKWithMother</method-name>
+         <method-params>
+            <method-param>java.lang.Object</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Manager</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>createChildUPKWithFather</method-name>
+         <method-params>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Manager</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>loadChildUPKWithFather</method-name>
+         <method-params>
+            <method-param>java.lang.Object</method-param>
+         </method-params>
+      </method>
+      <trans-attribute>RequiresNew</trans-attribute>
+   </container-transaction>
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+        <session>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <jndi-name>ejb/EJBTestRunner</jndi-name>
+      </session>
+
+      <entity>
+         <ejb-name>Student</ejb-name>
+         <local-jndi-name>Student</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+      <entity>
+         <ejb-name>Institute</ejb-name>
+         <local-jndi-name>Institute</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+      <entity>
+         <ejb-name>ChildUPK</ejb-name>
+         <local-jndi-name>ChildUPKLocal</local-jndi-name>
+         <configuration-name>INSERT after ejbPostCreate Container</configuration-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+      <entity>
+         <ejb-name>Examenation</ejb-name>
+         <local-jndi-name>Examenation</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+      <entity>
+         <ejb-name>Child</ejb-name>
+         <local-jndi-name>ChildLocal</local-jndi-name>
+         <configuration-name>INSERT after ejbPostCreate Container</configuration-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+      <entity>
+         <ejb-name>Parent</ejb-name>
+         <local-jndi-name>ParentLocal</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+      <entity>
+         <ejb-name>Department</ejb-name>
+         <local-jndi-name>Department</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+      <entity>
+         <ejb-name>Group</ejb-name>
+         <local-jndi-name>Group</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+
+      <session>
+         <ejb-name>Manager</ejb-name>
+         <jndi-name>Manager</jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+      </session>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+     <container-configurations>
+      <container-configuration extends="Standard CMP 2.x EntityBean">
+         <container-name>INSERT after ejbPostCreate Container</container-name>
+	 <insert-after-ejb-post-create>true</insert-after-ejb-post-create>
+      </container-configuration>
+   </container-configurations>
+
+</jboss>

Added: trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/fkmapping/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_2.dtd">
+
+<jbosscmp-jdbc>
+   <defaults>
+   </defaults>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jbosscmp-jdbc-beans.xml
+       that contains the <entity></entity> markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>Student</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>STUDENT</table-name>
+
+         <cmp-field>
+            <field-name>departmentCode</field-name>
+            <column-name>DEPT_CODE</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>departmentCode2</field-name>
+            <column-name>DEPT_CODE2</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>lastName</field-name>
+            <column-name>LAST_NAME</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>description</field-name>
+            <column-name>DESCR</column-name>
+
+        </cmp-field>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+      <entity>
+         <ejb-name>Institute</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>INSTITUTE</table-name>
+
+         <cmp-field>
+            <field-name>instituteId</field-name>
+            <column-name>INSTITUTE_ID</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>description</field-name>
+            <column-name>DESCR</column-name>
+
+        </cmp-field>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+      <entity>
+         <ejb-name>ChildUPK</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>CHILD_UPK</table-name>
+
+         <cmp-field>
+            <field-name>firstName</field-name>
+            <column-name>FIRST_NAME</column-name>
+
+        </cmp-field>
+
+	<unknown-pk>
+		<unknown-pk-class>java.lang.String</unknown-pk-class>
+	</unknown-pk>
+	<entity-command name="key-generator">
+	</entity-command>
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+      <entity>
+         <ejb-name>Examenation</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>EXAM</table-name>
+
+         <cmp-field>
+            <field-name>examId</field-name>
+            <column-name>EXAM_ID</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>subject</field-name>
+            <column-name>SUBJECT</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>departmentCode</field-name>
+            <column-name>DEPT_CODE</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>departmentCode2</field-name>
+            <column-name>DEPT_CODE2</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>groupNumber</field-name>
+            <column-name>GROUP_NUM</column-name>
+
+        </cmp-field>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+      <entity>
+         <ejb-name>Child</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>CHILD</table-name>
+
+         <cmp-field>
+            <field-name>id</field-name>
+            <column-name>CHILD_ID</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>firstName</field-name>
+            <column-name>FIRST_NAME</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>motherId</field-name>
+            <column-name>MOTHER_ID</column-name>
+			<not-null/>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>motherName</field-name>
+            <column-name>MOTHER_NAME</column-name>
+			<not-null/>
+
+        </cmp-field>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+      <entity>
+         <ejb-name>Parent</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>PARENT</table-name>
+
+         <cmp-field>
+            <field-name>id</field-name>
+            <column-name>PARENT_ID</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>firstName</field-name>
+            <column-name>FIRST_NAME</column-name>
+
+        </cmp-field>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+      <entity>
+         <ejb-name>Department</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>DEPARTMENT</table-name>
+
+         <cmp-field>
+            <field-name>departmentCode</field-name>
+            <column-name>DEPT_CODE</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>departmentCode2</field-name>
+            <column-name>DEPT_CODE2</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>description</field-name>
+            <column-name>DESCR</column-name>
+
+        </cmp-field>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+      <entity>
+         <ejb-name>Group</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>DEPT_GROUP</table-name>
+
+         <cmp-field>
+            <field-name>departmentCode</field-name>
+            <column-name>DEPT_CODE</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>departmentCode2</field-name>
+            <column-name>DEPT_CODE2</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>groupNumber</field-name>
+            <column-name>GROUP_NUM</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>description</field-name>
+            <column-name>DESCR</column-name>
+
+        </cmp-field>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+   </enterprise-beans>
+
+  <relationships>
+    <ejb-relation>
+      <ejb-relation-name>Institute-Department-StandaloneFK</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Department-has-Institute</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Institute-has-Departments</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>instituteId</field-name>
+               <column-name>INST_ID_FK</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+    <ejb-relation>
+      <ejb-relation-name>Group-Student-PartialFKToPK</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Student-has-Group</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Group-has-Students</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>departmentCode</field-name>
+               <column-name>DEPT_CODE</column-name>
+             </key-field>
+             <key-field>
+               <field-name>departmentCode2</field-name>
+               <column-name>DEPT_CODE2</column-name>
+             </key-field>
+             <key-field>
+               <field-name>groupNumber</field-name>
+               <column-name>GROUP_NUM_FK</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+    <ejb-relation>
+      <ejb-relation-name>Department-Student-CompleteFKToPK</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Student-has-Department</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Department-has-Students</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>departmentCode</field-name>
+               <column-name>DEPT_CODE</column-name>
+             </key-field>
+             <key-field>
+               <field-name>departmentCode2</field-name>
+               <column-name>DEPT_CODE2</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+    <ejb-relation>
+      <ejb-relation-name>Mother-Child</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Child-has-Mother</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Mother-has-Child</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>id</field-name>
+               <column-name>MOTHER_ID</column-name>
+             </key-field>
+             <key-field>
+               <field-name>firstName</field-name>
+               <column-name>MOTHER_NAME</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+    <ejb-relation>
+      <ejb-relation-name>Group-Exam-FKToCMP</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Exam-has-Group</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Group-has-Exams</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>departmentCode</field-name>
+               <column-name>DEPT_CODE</column-name>
+             </key-field>
+             <key-field>
+               <field-name>departmentCode2</field-name>
+               <column-name>DEPT_CODE2</column-name>
+             </key-field>
+             <key-field>
+               <field-name>groupNumber</field-name>
+               <column-name>GROUP_NUM</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+    <ejb-relation>
+      <ejb-relation-name>Department-Group-CompleteFKToPK</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Group-has-Department</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Department-has-Groups</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>departmentCode</field-name>
+               <column-name>DEPT_CODE</column-name>
+             </key-field>
+             <key-field>
+               <field-name>departmentCode2</field-name>
+               <column-name>DEPT_CODE2</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+    <ejb-relation>
+      <ejb-relation-name>Mother-Child-upk</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Child-has-Mother</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Mother-has-Child</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>id</field-name>
+               <column-name>MOTHER_ID</column-name>
+             </key-field>
+             <key-field>
+               <field-name>firstName</field-name>
+               <column-name>MOTHER_NAME</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+    <ejb-relation>
+      <ejb-relation-name>Father-Child-upk</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Child-has-Father</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>Father-has-Child</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>id</field-name>
+               <column-name>FATHER_ID</column-name>
+             </key-field>
+             <key-field>
+               <field-name>firstName</field-name>
+               <column-name>FATHER_NAME</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+  </relationships>
+
+</jbosscmp-jdbc>

Added: trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,308 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+      <session >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>Facade</ejb-name>
+
+         <home>org.jboss.test.cmp2.fkstackoverflow.ejb.FacadeHome</home>
+         <remote>org.jboss.test.cmp2.fkstackoverflow.ejb.Facade</remote>
+         <ejb-class>org.jboss.test.cmp2.fkstackoverflow.ejb.FacadeSession</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+      </session>
+
+         <session>
+         <description>JUnit Session Bean Test Runner</description>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
+         <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
+         <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Bean</transaction-type>
+      </session>
+
+      <!-- Entity Beans -->
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>SimpleParent</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentLocalHome</local-home>
+         <local>org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.fkstackoverflow.ejb.SimpleParentCMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.Long</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>SimpleParent</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>firstName</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+
+	  <!-- Write a file named ejb-finders-SimpleParentBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>Child</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.fkstackoverflow.ejb.ChildLocalHome</local-home>
+         <local>org.jboss.test.cmp2.fkstackoverflow.ejb.ChildLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.fkstackoverflow.ejb.ChildCMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.Long</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>Child</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>firstName</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>simpleParentId</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>complexParentId1</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>complexParentId2</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+
+	  <!-- Write a file named ejb-finders-ChildEntityBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[]]></description>
+
+         <ejb-name>ComplexParent</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentLocalHome</local-home>
+         <local>org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentCMP</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>org.jboss.test.cmp2.fkstackoverflow.ejb.ComplexParentPK</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>ComplexParent</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>id1</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>id2</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>firstName</field-name>
+         </cmp-field>
+
+	  <!-- Write a file named ejb-finders-ComplexParentBean.xml if you want to define extra finders. -->
+      </entity>
+
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+   <relationships >
+      <ejb-relation >
+         <ejb-relation-name>parent-children-simple2</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>child-has-parent</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Child</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>simpleParent2</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>parent-has-children</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>SimpleParent</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>children2</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+      <ejb-relation >
+         <ejb-relation-name>parent-children-complex2</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>child-has-parent</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Child</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>complexParent2</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>parent-has-children</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>ComplexParent</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>children2</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+      <ejb-relation >
+         <ejb-relation-name>parent-children-complex1</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>child-has-parent</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Child</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>complexParent1</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>parent-has-children</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>ComplexParent</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>children1</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+      <ejb-relation >
+         <ejb-relation-name>parent-children-simple1</ejb-relation-name>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>child-has-parent</ejb-relationship-role-name>
+            <multiplicity>Many</multiplicity>
+            <relationship-role-source >
+               <ejb-name>Child</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>simpleParent1</cmr-field-name>
+            </cmr-field>
+         </ejb-relationship-role>
+
+         <ejb-relationship-role >
+            <ejb-relationship-role-name>parent-has-children</ejb-relationship-role-name>
+            <multiplicity>One</multiplicity>
+            <relationship-role-source >
+               <ejb-name>SimpleParent</ejb-name>
+            </relationship-role-source>
+            <cmr-field >
+               <cmr-field-name>children1</cmr-field-name>
+               <cmr-field-type>java.util.Collection</cmr-field-type>
+            </cmr-field>
+         </ejb-relationship-role>
+
+      </ejb-relation>
+   </relationships>
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+   <container-transaction >
+      <method >
+         <ejb-name>SimpleParent</ejb-name>
+          <method-name>*</method-name>
+       </method>
+       <trans-attribute>Required</trans-attribute>
+    </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Child</ejb-name>
+          <method-name>*</method-name>
+       </method>
+       <trans-attribute>Required</trans-attribute>
+    </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>Facade</ejb-name>
+          <method-name>*</method-name>
+       </method>
+       <trans-attribute>Required</trans-attribute>
+    </container-transaction>
+   <container-transaction >
+      <method >
+         <ejb-name>ComplexParent</ejb-name>
+          <method-name>*</method-name>
+       </method>
+       <trans-attribute>Required</trans-attribute>
+    </container-transaction>
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+        <session>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <jndi-name>ejb/EJBTestRunner</jndi-name>
+      </session>
+
+      <entity>
+         <ejb-name>SimpleParent</ejb-name>
+         <local-jndi-name>SimpleParentLocal</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+      <entity>
+         <ejb-name>Child</ejb-name>
+         <local-jndi-name>ChildLocal</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+      <entity>
+         <ejb-name>ComplexParent</ejb-name>
+         <local-jndi-name>ComplexParentLocal</local-jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+
+      <session>
+         <ejb-name>Facade</ejb-name>
+         <jndi-name>Facade</jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+      </session>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+</jboss>

Added: trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/fkstackoverflow/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_2.dtd">
+
+<jbosscmp-jdbc>
+   <defaults>
+   </defaults>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jbosscmp-jdbc-beans.xml
+       that contains the <entity></entity> markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>SimpleParent</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>PARENT</table-name>
+
+         <cmp-field>
+            <field-name>id</field-name>
+            <column-name>PARENT_ID</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>firstName</field-name>
+            <column-name>FIRST_NAME</column-name>
+
+        </cmp-field>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+      <entity>
+         <ejb-name>Child</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>CHILD</table-name>
+
+         <cmp-field>
+            <field-name>id</field-name>
+            <column-name>CHILD_ID</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>firstName</field-name>
+            <column-name>FIRST_NAME</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>simpleParentId</field-name>
+            <column-name>PARENT_ID</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>complexParentId1</field-name>
+            <column-name>COMPLEXPARENT_ID1</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>complexParentId2</field-name>
+            <column-name>COMPLEXPARENT_ID2</column-name>
+
+        </cmp-field>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+      <entity>
+         <ejb-name>ComplexParent</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+         <table-name>COMPLEXPARENT</table-name>
+
+         <cmp-field>
+            <field-name>id1</field-name>
+            <column-name>PARENT_ID</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>id2</field-name>
+            <column-name>PARENT_ID2</column-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>firstName</field-name>
+            <column-name>FIRST_NAME</column-name>
+
+        </cmp-field>
+
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+   </enterprise-beans>
+
+  <relationships>
+    <ejb-relation>
+      <ejb-relation-name>parent-children-simple2</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>child-has-parent</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>parent-has-children</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>id</field-name>
+               <column-name>PARENT_ID</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+    <ejb-relation>
+      <ejb-relation-name>parent-children-complex2</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>child-has-parent</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>parent-has-children</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>id1</field-name>
+               <column-name>COMPLEXPARENT_ID1</column-name>
+             </key-field>
+             <key-field>
+               <field-name>id2</field-name>
+               <column-name>COMPLEXPARENT_ID2</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+    <ejb-relation>
+      <ejb-relation-name>parent-children-complex1</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>child-has-parent</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>parent-has-children</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>id1</field-name>
+               <column-name>COMPLEXPARENT_ID1</column-name>
+             </key-field>
+             <key-field>
+               <field-name>id2</field-name>
+               <column-name>COMPLEXPARENT_ID2</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+    <ejb-relation>
+      <ejb-relation-name>parent-children-simple1</ejb-relation-name>
+
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>child-has-parent</ejb-relationship-role-name>
+		  <key-fields/>
+
+      </ejb-relationship-role>
+      <ejb-relationship-role>
+          <ejb-relationship-role-name>parent-has-children</ejb-relationship-role-name>
+          <key-fields>
+             <key-field>
+               <field-name>id</field-name>
+               <column-name>PARENT_ID</column-name>
+             </key-field>
+          </key-fields>
+
+      </ejb-relationship-role>
+    </ejb-relation>
+  </relationships>
+
+</jbosscmp-jdbc>

Added: trunk/testsuite/src/resources/cmp2/passivation/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/passivation/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/passivation/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,75 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+     <!--
+       To add session beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called session-beans.xml that contains
+       the <session></session> markup for those beans.
+     -->
+
+      <!-- Entity Beans -->
+      <entity >
+         <description><![CDATA[An entity bean to test the entity activation/passivation mechanism provided by JBoss.]]></description>
+
+         <ejb-name>RapidlyPassivatedEntity</ejb-name>
+
+         <home>org.jboss.test.cmp2.passivation.interfaces.RapidlyPassivatedEntityHome</home>
+         <remote>org.jboss.test.cmp2.passivation.interfaces.RapidlyPassivatedEntity</remote>
+         <local-home>org.jboss.test.cmp2.passivation.interfaces.RapidlyPassivatedEntityLocalHome</local-home>
+         <local>org.jboss.test.cmp2.passivation.interfaces.RapidlyPassivatedEntityLocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.passivation.ejb.RapidlyPassivatedEntityBean</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.Object</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>RapidlyPassivatedEntity</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>data</field-name>
+         </cmp-field>
+
+	  <!-- Write a file named ejb-finders-RapidlyPassivatedEntityBean.xml if you want to define extra finders. -->
+      </entity>
+
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/cmp2/passivation/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/passivation/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/passivation/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jboss-beans.xml that contains
+       the <session></session>, <entity></entity> and <message-driven></message-driven>
+       markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>RapidlyPassivatedEntity</ejb-name>
+         <jndi-name>ejb/remote/RapidlyPassivatedEntity</jndi-name>
+         <local-jndi-name>ejb/local/RapidlyPassivatedEntity</local-jndi-name>
+         <configuration-name>Short lived CMP 2.0 Entity Bean</configuration-name>
+
+        <method-attributes>
+        </method-attributes>
+
+      </entity>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+     <container-configurations>
+
+      <container-configuration>
+         <container-name>Short lived CMP 2.0 Entity Bean</container-name>
+         <call-logging>false</call-logging>
+         <invoker-proxy-binding-name>entity-unified-invoker</invoker-proxy-binding-name>
+         <sync-on-commit-only>false</sync-on-commit-only>
+         <container-interceptors>
+            <interceptor>org.jboss.ejb.plugins.ProxyFactoryFinderInterceptor</interceptor>
+            <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+            <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
+            <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
+            <interceptor metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor>
+            <interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
+            <interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
+            <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
+            <interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
+            <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
+            <interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+            <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
+         </container-interceptors>
+         <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
+         <instance-cache>org.jboss.ejb.plugins.InvalidableEntityInstanceCache</instance-cache>
+         <persistence-manager>org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager</persistence-manager>
+         <locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
+         <container-cache-conf>
+            <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+            <cache-policy-conf>
+               <min-capacity>5</min-capacity>
+               <max-capacity>10</max-capacity>
+               <overager-period>5</overager-period>
+               <max-bean-age>8</max-bean-age>
+               <resizer-period>7</resizer-period>
+               <max-cache-miss-period>60</max-cache-miss-period>
+               <min-cache-miss-period>1</min-cache-miss-period>
+               <cache-load-factor>0.75</cache-load-factor>
+            </cache-policy-conf>
+         </container-cache-conf>
+         <container-pool-conf>
+            <MaximumSize>100</MaximumSize>
+         </container-pool-conf>
+         <commit-option>B</commit-option>
+      </container-configuration>
+
+   </container-configurations>
+
+</jboss>

Added: trunk/testsuite/src/resources/cmp2/passivation/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/passivation/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/cmp2/passivation/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_2.dtd">
+
+<jbosscmp-jdbc>
+   <defaults>
+   </defaults>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jbosscmp-jdbc-beans.xml
+       that contains the <entity></entity> markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>RapidlyPassivatedEntity</ejb-name>
+         <create-table>true</create-table>
+         <remove-table>true</remove-table>
+
+         <cmp-field>
+            <field-name>data</field-name>
+
+        </cmp-field>
+
+	<unknown-pk>
+		<unknown-pk-class>java.lang.String</unknown-pk-class>
+	</unknown-pk>
+	<entity-command name="key-generator">
+	</entity-command>
+<!-- jboss 3.2 features -->
+<!-- optimistic locking does not express the exclusions needed -->
+      </entity>
+
+   </enterprise-beans>
+
+</jbosscmp-jdbc>

Added: trunk/testsuite/src/resources/ejbconf/readonly/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/ejbconf/readonly/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/ejbconf/readonly/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,95 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+      <session >
+         <description><![CDATA[ReadOnlyHelperSessionBean.java Created: Fri Apr 12 23:37:41 2002]]></description>
+
+         <ejb-name>ReadOnlyHelper</ejb-name>
+
+         <home>org.jboss.test.ejbconf.beans.interfaces.ReadOnlyHelperHome</home>
+         <remote>org.jboss.test.ejbconf.beans.interfaces.ReadOnlyHelper</remote>
+         <ejb-class>org.jboss.test.ejbconf.beans.ejb.ReadOnlyHelperSessionBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+      </session>
+
+     <!--
+       To add session beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called session-beans.xml that contains
+       the <session></session> markup for those beans.
+     -->
+
+      <!-- Entity Beans -->
+      <entity >
+         <description><![CDATA[ReadOnlyBean.java Created: Tue Jan 22 17:13:36 2002]]></description>
+
+         <ejb-name>ReadOnly</ejb-name>
+
+         <home>org.jboss.test.ejbconf.beans.interfaces.ReadOnlyHome</home>
+         <remote>org.jboss.test.ejbconf.beans.interfaces.ReadOnly</remote>
+         <local-home>org.jboss.test.ejbconf.beans.interfaces.ReadOnlyLocalHome</local-home>
+         <local>org.jboss.test.ejbconf.beans.interfaces.ReadOnlyLocal</local>
+
+         <ejb-class>org.jboss.test.ejbconf.beans.ejb.ReadOnlyBean</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.Integer</prim-key-class>
+         <reentrant>False</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>ReadOnly</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[Get the value of id.]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[Get the value of value.]]></description>
+            <field-name>value</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+
+	  <!-- Write a file named ejb-finders-ReadOnlyBean.xml if you want to define extra finders. -->
+      </entity>
+
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/ejbconf/readonly/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/ejbconf/readonly/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/ejbconf/readonly/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jboss-beans.xml that contains
+       the <session></session>, <entity></entity> and <message-driven></message-driven>
+       markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>ReadOnly</ejb-name>
+         <jndi-name>ReadOnly</jndi-name>
+         <local-jndi-name>LocalReadOnly</local-jndi-name>
+         <read-only>true</read-only>
+
+      </entity>
+
+      <session>
+         <ejb-name>ReadOnlyHelper</ejb-name>
+         <jndi-name>ReadOnlyHelper</jndi-name>
+
+      </session>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+</jboss>

Added: trunk/testsuite/src/resources/ejbconf/readonly/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/ejbconf/readonly/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/ejbconf/readonly/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.0//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_0.dtd">
+
+<jbosscmp-jdbc>
+   <defaults>
+     <datasource>java:/DefaultDS</datasource>
+     <datasource-mapping>Hypersonic SQL</datasource-mapping>
+   </defaults>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jbosscmp-jdbc-beans.xml
+       that contains the <entity></entity> markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>ReadOnly</ejb-name>
+         <read-only>true</read-only>
+
+         <cmp-field>
+            <field-name>id</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>value</field-name>
+
+        </cmp-field>
+
+      </entity>
+
+   </enterprise-beans>
+
+</jbosscmp-jdbc>

Added: trunk/testsuite/src/resources/jmx/eardepends/dependent/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/eardepends/dependent/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/jmx/eardepends/dependent/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,81 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+      <session >
+         <description><![CDATA[DependentB SessionBean]]></description>
+         <display-name>DependentB SessionBean</display-name>
+
+         <ejb-name>DependentBEJB</ejb-name>
+
+         <home>org.jboss.test.jmx.eardepends.dependent.interfaces.DependentBEJBHome</home>
+         <remote>org.jboss.test.jmx.eardepends.dependent.interfaces.DependentBEJB</remote>
+         <ejb-class>org.jboss.test.jmx.eardepends.dependent.ejb.DependentBBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+      </session>
+
+      <session >
+         <description><![CDATA[DependentA SessionBean]]></description>
+         <display-name>DependentA SessionBean</display-name>
+
+         <ejb-name>DependentAEJB</ejb-name>
+
+         <home>org.jboss.test.jmx.eardepends.dependent.interfaces.DependentAEJBHome</home>
+         <remote>org.jboss.test.jmx.eardepends.dependent.interfaces.DependentAEJB</remote>
+         <ejb-class>org.jboss.test.jmx.eardepends.dependent.ejb.DependentABean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+      </session>
+
+     <!--
+       To add session beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called session-beans.xml that contains
+       the <session></session> markup for those beans.
+     -->
+
+      <!-- Entity Beans -->
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/jmx/eardepends/dependent/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/eardepends/dependent/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/jmx/eardepends/dependent/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jboss-beans.xml that contains
+       the <session></session>, <entity></entity> and <message-driven></message-driven>
+       markup for those beans.
+     -->
+
+      <session>
+         <ejb-name>DependentBEJB</ejb-name>
+         <jndi-name>test/DependentB</jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+      </session>
+      <session>
+         <ejb-name>DependentAEJB</ejb-name>
+         <jndi-name>test/DependentA</jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+      </session>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+  <container-configurations>
+  <container-configuration>
+    <container-name>Standard Stateless SessionBean</container-name>
+    <depends>test:name=Test</depends>
+  </container-configuration>
+</container-configurations>
+
+</jboss>

Added: trunk/testsuite/src/resources/jmx/eardepends/independent/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/eardepends/independent/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/jmx/eardepends/independent/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,65 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+      <session >
+         <description><![CDATA[Independent SessionBean]]></description>
+         <display-name>Independent SessionBean</display-name>
+
+         <ejb-name>IndependentEJB</ejb-name>
+
+         <home>org.jboss.test.jmx.eardepends.independent.interfaces.IndependentEJBHome</home>
+         <remote>org.jboss.test.jmx.eardepends.independent.interfaces.IndependentEJB</remote>
+         <ejb-class>org.jboss.test.jmx.eardepends.independent.ejb.IndependentBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+      </session>
+
+     <!--
+       To add session beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called session-beans.xml that contains
+       the <session></session> markup for those beans.
+     -->
+
+      <!-- Entity Beans -->
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/jmx/eardepends/independent/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/eardepends/independent/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/jmx/eardepends/independent/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jboss-beans.xml that contains
+       the <session></session>, <entity></entity> and <message-driven></message-driven>
+       markup for those beans.
+     -->
+
+      <session>
+         <ejb-name>IndependentEJB</ejb-name>
+         <jndi-name>test/Independent</jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+      </session>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+</jboss>

Added: trunk/testsuite/src/resources/jmx/eardeployment/a/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/eardeployment/a/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/jmx/eardeployment/a/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,66 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+      <session >
+         <description><![CDATA[SessionABean.java Created: Thu Feb 21 14:48:18 2002]]></description>
+
+         <ejb-name>SessionA</ejb-name>
+
+         <home>org.jboss.test.jmx.eardeployment.a.interfaces.SessionAHome</home>
+         <remote>org.jboss.test.jmx.eardeployment.a.interfaces.SessionA</remote>
+         <local-home>org.jboss.test.jmx.eardeployment.a.interfaces.SessionALocalHome</local-home>
+         <local>org.jboss.test.jmx.eardeployment.a.interfaces.SessionALocal</local>
+         <ejb-class>org.jboss.test.jmx.eardeployment.a.ejb.SessionABean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+      </session>
+
+     <!--
+       To add session beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called session-beans.xml that contains
+       the <session></session> markup for those beans.
+     -->
+
+      <!-- Entity Beans -->
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/jmx/eardeployment/a/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/eardeployment/a/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/jmx/eardeployment/a/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jboss-beans.xml that contains
+       the <session></session>, <entity></entity> and <message-driven></message-driven>
+       markup for those beans.
+     -->
+
+      <session>
+         <ejb-name>SessionA</ejb-name>
+         <jndi-name>eardeployment/SessionA</jndi-name>
+         <local-jndi-name>eardeployment/LocalSessionA</local-jndi-name>
+
+      </session>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+</jboss>

Added: trunk/testsuite/src/resources/jmx/eardeployment/b/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/eardeployment/b/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/jmx/eardeployment/b/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,66 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+      <session >
+         <description><![CDATA[SessionBBean.java Created: Thu Feb 21 14:50:22 2002]]></description>
+
+         <ejb-name>SessionB</ejb-name>
+
+         <home>org.jboss.test.jmx.eardeployment.b.interfaces.SessionBHome</home>
+         <remote>org.jboss.test.jmx.eardeployment.b.interfaces.SessionB</remote>
+         <local-home>org.jboss.test.jmx.eardeployment.b.interfaces.SessionBLocalHome</local-home>
+         <local>org.jboss.test.jmx.eardeployment.b.interfaces.SessionBLocal</local>
+         <ejb-class>org.jboss.test.jmx.eardeployment.b.ejb.SessionBBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+      </session>
+
+     <!--
+       To add session beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called session-beans.xml that contains
+       the <session></session> markup for those beans.
+     -->
+
+      <!-- Entity Beans -->
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/jmx/eardeployment/b/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/eardeployment/b/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/jmx/eardeployment/b/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jboss-beans.xml that contains
+       the <session></session>, <entity></entity> and <message-driven></message-driven>
+       markup for those beans.
+     -->
+
+      <session>
+         <ejb-name>SessionB</ejb-name>
+         <jndi-name>eardeployment/SessionB</jndi-name>
+         <local-jndi-name>eardeployment/LocalSessionB</local-jndi-name>
+
+      </session>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+</jboss>

Added: trunk/testsuite/src/resources/jmx/loading/cpmanifest/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/loading/cpmanifest/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/jmx/loading/cpmanifest/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,64 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+      <session >
+         <description><![CDATA[ConcreteBean.java]]></description>
+
+         <ejb-name>Concrete</ejb-name>
+
+         <home>org.jboss.test.jmx.loading.ConcreteHome</home>
+         <remote>org.jboss.test.jmx.loading.Concrete</remote>
+         <ejb-class>org.jboss.test.jmx.loading.ConcreteBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+      </session>
+
+     <!--
+       To add session beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called session-beans.xml that contains
+       the <session></session> markup for those beans.
+     -->
+
+      <!-- Entity Beans -->
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/jmx/undeploy/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/undeploy/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/jmx/undeploy/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,135 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+     <!--
+       To add session beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called session-beans.xml that contains
+       the <session></session> markup for those beans.
+     -->
+
+      <!-- Entity Beans -->
+      <entity >
+         <description><![CDATA[EntityB.java Created: Wed Mar 6 20:08:11 2002]]></description>
+
+         <ejb-name>EntityB</ejb-name>
+
+         <home>org.jboss.test.jmx.interfaces.EntityBHome</home>
+         <remote>org.jboss.test.jmx.interfaces.EntityB</remote>
+
+         <ejb-class>org.jboss.test.jmx.ejb.EntityBBean</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.Integer</prim-key-class>
+         <reentrant>False</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>EntityB</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[Abstract cmp2 field get-set pair for field id Get the value of id]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[Abstract cmp2 field get-set pair for field value Get the value of value]]></description>
+            <field-name>value</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+
+         <resource-ref >
+            <res-ref-name>datasource</res-ref-name>
+            <res-type>javax.sql.DataSource</res-type>
+            <res-auth>Container</res-auth>
+         </resource-ref>
+
+	  <!-- Write a file named ejb-finders-EntityBBean.xml if you want to define extra finders. -->
+      </entity>
+
+      <entity >
+         <description><![CDATA[EntityA.java Created: Wed Mar 6 20:08:11 2002]]></description>
+
+         <ejb-name>EntityA</ejb-name>
+
+         <home>org.jboss.test.jmx.interfaces.EntityAHome</home>
+         <remote>org.jboss.test.jmx.interfaces.EntityA</remote>
+
+         <ejb-class>org.jboss.test.jmx.ejb.EntityABean</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.Integer</prim-key-class>
+         <reentrant>False</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>EntityA</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[Abstract cmp2 field get-set pair for field id Get the value of id]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[Abstract cmp2 field get-set pair for field value Get the value of value]]></description>
+            <field-name>value</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+
+	  <!-- Write a file named ejb-finders-EntityABean.xml if you want to define extra finders. -->
+      </entity>
+
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <method-permission >
+      <description><![CDATA[description not supported yet by ejbdoclet]]></description>
+      <unchecked/>
+      <method >
+         <ejb-name>EntityB</ejb-name>
+         <method-name>findAll</method-name>
+         <method-params>
+         </method-params>
+      </method>
+   </method-permission>
+
+   <!-- finder permissions -->
+
+   <method-permission >
+      <description><![CDATA[description not supported yet by ejbdoclet]]></description>
+      <unchecked/>
+      <method >
+         <ejb-name>EntityA</ejb-name>
+         <method-name>findAll</method-name>
+         <method-params>
+         </method-params>
+      </method>
+   </method-permission>
+
+   <!-- transactions -->
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/jmx/undeploy/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/undeploy/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/jmx/undeploy/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jboss-beans.xml that contains
+       the <session></session>, <entity></entity> and <message-driven></message-driven>
+       markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>EntityB</ejb-name>
+         <jndi-name>EntityB</jndi-name>
+         <resource-ref>
+            <res-ref-name>datasource</res-ref-name>
+            <resource-name>TestDS</resource-name>
+         </resource-ref>
+
+      </entity>
+      <entity>
+         <ejb-name>EntityA</ejb-name>
+         <jndi-name>EntityA</jndi-name>
+
+      </entity>
+
+   </enterprise-beans>
+
+   <resource-managers>
+      <resource-manager>
+         <res-name>TestDS</res-name>
+         <res-jndi-name>java:/XmlDeployTestDS</res-jndi-name>
+      </resource-manager>
+   </resource-managers>
+
+</jboss>

Added: trunk/testsuite/src/resources/jmx/undeploy/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/undeploy/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/jmx/undeploy/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.0//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_0.dtd">
+
+<jbosscmp-jdbc>
+   <defaults>
+     <datasource>java:/DefaultDS</datasource>
+     <datasource-mapping>Hypersonic SQL</datasource-mapping>
+   </defaults>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jbosscmp-jdbc-beans.xml
+       that contains the <entity></entity> markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>EntityB</ejb-name>
+         <datasource>java:/XmlDeployTestDS</datasource>
+         <datasource-mapping>Hypersonic SQL</datasource-mapping>
+
+         <cmp-field>
+            <field-name>id</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>value</field-name>
+
+        </cmp-field>
+
+      </entity>
+
+      <entity>
+         <ejb-name>EntityA</ejb-name>
+
+         <cmp-field>
+            <field-name>id</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>value</field-name>
+
+        </cmp-field>
+
+      </entity>
+
+   </enterprise-beans>
+
+</jbosscmp-jdbc>

Added: trunk/testsuite/src/resources/jmx/xmbean/org/jboss/test/jmx/xmbean/User.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/xmbean/org/jboss/test/jmx/xmbean/User.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/jmx/xmbean/org/jboss/test/jmx/xmbean/User.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,169 @@
+<?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>sample for jboss xmbean.dtd</description>
+  <descriptors>
+    <persistence persistPolicy="Never"
+                 persistPeriod="10"
+                 persistLocation="pl1"
+                 persistName="JBossXMLExample1"/>
+    <currencyTimeLimit value="10"/>
+    <state-action-on-update value="restart"/>
+  </descriptors>
+  <class>org.jboss.test.jmx.xmbean.User</class>
+
+  <constructor>
+    <description>(no description)</description>
+    <name>org.jboss.test.jmx.xmbean.User</name>
+  </constructor>
+  <constructor>
+    <description>(no description)</description>
+    <name>org.jboss.test.jmx.xmbean.User</name>
+  </constructor>
+
+  <!--attributes-->
+  <attribute access="read-only" getMethod="getID">
+
+    <description>(no description)</description>
+    <name>ID</name>
+    <type>long</type>
+    <descriptors>
+      <persistence persistPolicy="Never"
+                   persistPeriod="30"/>
+      <currencyTimeLimit value="30"/>
+
+    </descriptors>
+  </attribute>
+  <attribute access="read-write" getMethod="getNumber" setMethod="setNumber">
+
+    <description>(no description)</description>
+    <name>Number</name>
+    <type>int</type>
+    <descriptors>
+      <persistence persistPolicy="Never"
+                   persistPeriod="30"/>
+      <currencyTimeLimit value="30"/>
+      <value value="5"/>
+
+    </descriptors>
+  </attribute>
+  <attribute access="read-write" getMethod="getName" setMethod="setName">
+
+    <description>(no description)</description>
+    <name>Name</name>
+    <type>java.lang.String</type>
+    <descriptors>
+      <persistence persistPolicy="Never"
+                   persistPeriod="30"/>
+      <currencyTimeLimit value="30"/>
+      <value value="test name"/>
+
+    </descriptors>
+  </attribute>
+  <attribute access="read-write" getMethod="getAddress" setMethod="setAddress">
+
+    <description>(no description)</description>
+    <name>Address</name>
+    <type>java.lang.String</type>
+    <descriptors>
+      <persistence persistPolicy="Never"
+                   persistPeriod="30"/>
+      <currencyTimeLimit value="30"/>
+      <value value="somewhere"/>
+
+    </descriptors>
+  </attribute>
+  <attribute access="read-write" getMethod="getPhoneNumbers" setMethod="setPhoneNumbers">
+
+    <description>(no description)</description>
+    <name>PhoneNumbers</name>
+    <type>java.util.Collection</type>
+    <descriptors>
+      <persistence persistPolicy="Never"
+                   persistPeriod="30"/>
+      <currencyTimeLimit value="30"/>
+
+    </descriptors>
+  </attribute>
+  <attribute access="read-write" setMethod="setPassword">
+
+    <description>(no description)</description>
+    <name>Password</name>
+    <type>java.lang.String</type>
+    <descriptors>
+      <persistence persistPolicy="Never"
+                   persistPeriod="30"/>
+      <currencyTimeLimit value="30"/>
+
+    </descriptors>
+  </attribute>
+
+<!--artificial attributes-->
+    <attribute access="read-write">
+
+    <description>artificial attribute not impemeneted in class</description>
+    <name>ArtificialAttribute</name>
+    <type>java.lang.String</type>
+    <descriptors>
+      <persistence
+                   persistLocation="pl1"
+                   persistName="JBossXMLExample1"
+/>
+      <currencyTimeLimit value="999999"/>
+
+    </descriptors>
+    </attribute>
+
+<!--operations -->
+  <operation impact="ACTION_INFO">
+    <description>(no description)</description>
+    <name>printInfo</name>
+    <return-type>java.lang.String</return-type>
+    <descriptors>
+    </descriptors>
+  </operation>
+  <operation impact="ACTION_INFO">
+    <description>(no description)</description>
+    <name>addPhoneNumber</name>
+    <parameter>
+      <description>(no description)</description>
+      <name>number</name>
+      <type>java.lang.String</type>
+    </parameter>
+    <return-type>void</return-type>
+    <descriptors>
+    </descriptors>
+  </operation>
+  <operation impact="ACTION_INFO">
+    <description>(no description)</description>
+    <name>removePhoneNumber</name>
+    <parameter>
+      <description>(no description)</description>
+      <name>number</name>
+      <type>java.lang.String</type>
+    </parameter>
+    <return-type>void</return-type>
+    <descriptors>
+    </descriptors>
+  </operation>
+
+<!--artificial operations-->
+
+<!--notifications -->
+  <notification>
+    <description>first notification</description>
+    <name>javax.management.SomeEvent</name>
+    <notification-type>xd.example.first</notification-type>
+    <notification-type>xd.example.second</notification-type>
+    <descriptors>
+      <persistence persistPolicy="Never"
+                   persistPeriod="20"
+                   persistLocation="pl2"
+                   persistName="JBossXMLExample2"
+/>
+      <currencyTimeLimit value="20"/>
+    </descriptors>
+  </notification>
+
+</mbean>

Added: trunk/testsuite/src/resources/proxycompiler/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/proxycompiler/META-INF/ejb-jar.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/proxycompiler/META-INF/ejb-jar.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,116 @@
+<?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><![CDATA[No Description.]]></description>
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+     <!--
+       To add session beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called session-beans.xml that contains
+       the <session></session> markup for those beans.
+     -->
+
+      <!-- Entity Beans -->
+      <entity >
+         <description><![CDATA[ReadOnlyBean.java Created: Tue Jan 22 17:13:36 2002]]></description>
+
+         <ejb-name>ProxyCompilerTest</ejb-name>
+
+         <home>org.jboss.test.proxycompiler.beans.interfaces.ProxyCompilerTestHome</home>
+         <remote>org.jboss.test.proxycompiler.beans.interfaces.ProxyCompilerTest</remote>
+         <local-home>org.jboss.test.proxycompiler.beans.interfaces.ProxyCompilerTestLocalHome</local-home>
+         <local>org.jboss.test.proxycompiler.beans.interfaces.ProxyCompilerTestLocal</local>
+
+         <ejb-class>org.jboss.test.proxycompiler.beans.ejb.ProxyCompilerTestBean</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.Integer</prim-key-class>
+         <reentrant>False</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>ProxyCompilerTest</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>pk</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>bool</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>byte</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>char</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>double</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>float</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>int</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>long</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>short</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>objectArray</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>intArray</field-name>
+         </cmp-field>
+         <primkey-field>pk</primkey-field>
+
+	  <!-- Write a file named ejb-finders-ProxyCompilerTestBean.xml if you want to define extra finders. -->
+      </entity>
+
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+
+   <!-- Assembly Descriptor -->
+   <assembly-descriptor >
+     <!--
+       To add additional assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <!-- finder permissions -->
+
+   <!-- transactions -->
+
+   <!-- finder transactions -->
+   </assembly-descriptor>
+
+</ejb-jar>

Added: trunk/testsuite/src/resources/proxycompiler/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/proxycompiler/META-INF/jboss.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/proxycompiler/META-INF/jboss.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+
+<jboss>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jboss-beans.xml that contains
+       the <session></session>, <entity></entity> and <message-driven></message-driven>
+       markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>ProxyCompilerTest</ejb-name>
+         <jndi-name>ProxyCompilerTest</jndi-name>
+         <local-jndi-name>LocalProxyCompilerTest</local-jndi-name>
+
+      </entity>
+
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+</jboss>

Added: trunk/testsuite/src/resources/proxycompiler/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/proxycompiler/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:43:43 UTC (rev 54987)
+++ trunk/testsuite/src/resources/proxycompiler/META-INF/jbosscmp-jdbc.xml	2006-08-01 17:47:17 UTC (rev 54988)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC "-//JBoss//DTD JBOSSCMP-JDBC 3.0//EN" "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_0.dtd">
+
+<jbosscmp-jdbc>
+   <defaults>
+   </defaults>
+
+   <enterprise-beans>
+
+     <!--
+       To add beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called jbosscmp-jdbc-beans.xml
+       that contains the <entity></entity> markup for those beans.
+     -->
+
+      <entity>
+         <ejb-name>ProxyCompilerTest</ejb-name>
+
+         <cmp-field>
+            <field-name>pk</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>bool</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>byte</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>char</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>double</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>float</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>int</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>long</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>short</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>objectArray</field-name>
+
+        </cmp-field>
+         <cmp-field>
+            <field-name>intArray</field-name>
+
+        </cmp-field>
+
+      </entity>
+
+   </enterprise-beans>
+
+</jbosscmp-jdbc>




More information about the jboss-cvs-commits mailing list