[openejb-scm] openejb/modules/core/src/java/org/openejb/deployment OpenEJBModuleBuilder.java TransactionPolicyHelper.java

[dain]

dain        2004/08/22 03:26:06

  Modified:    modules/core/src/java/org/openejb/deployment
                        OpenEJBModuleBuilder.java
                        TransactionPolicyHelper.java
  Log:

  Dropped requirement that ejbs have an assembly descriptor and tranasaction
  attribute
  
  Revision  Changes    Path
  1.20      +7 -2      
openejb/modules/core/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
  
  Index: OpenEJBModuleBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- OpenEJBModuleBuilder.java 6 Aug 2004 22:48:55 -0000       1.19
  +++ OpenEJBModuleBuilder.java 22 Aug 2004 07:26:05 -0000      1.20
  @@ -549,7 +549,12 @@
               openejbBeans.put(messageDrivenBean.getEjbName(), messageDrivenBean);
           }
   
  -        TransactionPolicyHelper transactionPolicyHelper = new 
TransactionPolicyHelper(ejbJar.getAssemblyDescriptor().getContainerTransactionArray());
  +        TransactionPolicyHelper transactionPolicyHelper;
  +        if (ejbJar.isSetAssemblyDescriptor()) {
  +            transactionPolicyHelper = new 
TransactionPolicyHelper(ejbJar.getAssemblyDescriptor().getContainerTransactionArray());
  +        } else {
  +            transactionPolicyHelper = new TransactionPolicyHelper();
  +        }
   
           Security security = buildSecurityConfig(openejbEjbJar);
   
  
  
  
  1.7       +10 -7     
openejb/modules/core/src/java/org/openejb/deployment/TransactionPolicyHelper.java
  
  Index: TransactionPolicyHelper.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/TransactionPolicyHelper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TransactionPolicyHelper.java      18 Jul 2004 22:32:20 -0000      1.6
  +++ TransactionPolicyHelper.java      22 Aug 2004 07:26:05 -0000      1.7
  @@ -60,18 +60,14 @@
   import org.apache.geronimo.xbeans.j2ee.JavaTypeType;
   import org.apache.geronimo.xbeans.j2ee.MethodIntfType;
   import org.apache.geronimo.xbeans.j2ee.MethodType;
  -
   import org.openejb.dispatch.InterfaceMethodSignature;
   import org.openejb.transaction.BeanPolicy;
   import org.openejb.transaction.ContainerPolicy;
   import org.openejb.transaction.TransactionPolicy;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
  - *
  - * */
  + */
   public class TransactionPolicyHelper {
   
       public final static TransactionPolicySource StatefulBMTPolicySource = new 
TransactionPolicySource() {
  @@ -88,6 +84,9 @@
   
       private final Map ejbNameToTransactionAttributesMap = new HashMap();
   
  +    public TransactionPolicyHelper() {
  +    }
  +
       public TransactionPolicyHelper(ContainerTransactionType[] 
containerTransactions) {
           for (int i = 0; i < containerTransactions.length; i++) {
               ContainerTransactionType containerTransaction = 
containerTransactions[i];
  @@ -117,11 +116,15 @@
   
       private static class TransactionPolicySourceImpl implements 
TransactionPolicySource {
           private final SortedSet transactionPolicies;
  +        private static final boolean STRICT = false;
   
           public TransactionPolicySourceImpl(String ejbName, SortedSet 
transactionPolicies) throws DeploymentException {
               //To allow more lenient spec interpretations, with default of Requires, 
substitute an empty sorted set here.
               if (transactionPolicies == null) {
  -                throw new DeploymentException("You must specify transaction 
attributes, see ejb 2.1 spec 17.4.1: ejbName=" + ejbName);
  +                if (STRICT) {
  +                    throw new DeploymentException("You must specify transaction 
attributes, see ejb 2.1 spec 17.4.1: ejbName=" + ejbName);
  +                }
  +                transactionPolicies = new TreeSet();
               }
               this.transactionPolicies = transactionPolicies;
           }